Skip to content

NO-ISSUE: rebase-main-4.18.0-0.nightly-2024-09-29-150556_amd64-2024-09-29_arm64-2024-09-29 #3996

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
microshift-rebase-script wants to merge 9 commits into from
Closed

NO-ISSUE: rebase-main-4.18.0-0.nightly-2024-09-29-150556_amd64-2024-09-29_arm64-2024-09-29 #3996

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
275edb1
update last_rebase.sh
Sep 30, 2024
fe2ff59
update changelog
Sep 30, 2024
1fb7242
update microshift/go.mod
Sep 30, 2024
82d28f2
update microshift/vendor
Sep 30, 2024
c51fe5d
update etcd/go.mod
Sep 30, 2024
e137fdf
update etcd/vendor
Sep 30, 2024
c46da60
update component images
Sep 30, 2024
78b75fa
update manifests
Sep 30, 2024
e54363d
update buildfiles
Sep 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile.kube_git.var
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
KUBE_GIT_MAJOR=1
KUBE_GIT_MINOR=30
KUBE_GIT_VERSION=v1.30.3
KUBE_GIT_COMMIT=ce117ff87249deb45bf9564d976255645e530105
KUBE_GIT_COMMIT=947ea2f8f2a97d76a8bc9382c1ecda89fbc13555
KUBE_GIT_TREE_STATE=clean
2 changes: 1 addition & 1 deletion Makefile.version.aarch64.var
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.18.0-0.nightly-arm64-2024-09-27-000855
OCP_VERSION := 4.18.0-0.nightly-arm64-2024-09-29-233859
2 changes: 1 addition & 1 deletion Makefile.version.x86_64.var
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.18.0-0.nightly-2024-09-23-182657
OCP_VERSION := 4.18.0-0.nightly-2024-09-29-150556
2 changes: 2 additions & 0 deletions assets/controllers/kube-controller-manager/defaultconfig.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ extendedArguments:
- "-ttl" # TODO: this is excluded in kube-core, but not in #21092
- "-bootstrapsigner"
- "-tokencleaner"
cloud-provider:
- "external"
cluster-signing-duration:
- "720h"
secure-port:
Expand Down
2 changes: 1 addition & 1 deletion assets/optional/multus/release-multus-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.18.0-0.nightly-arm64-2024-09-27-000855"
"base": "4.18.0-0.nightly-arm64-2024-09-29-233859"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b10e8eb8c507b1f0c630480acb9f3c82a8da74522e271a46983b50d413a20b77",
Expand Down
2 changes: 1 addition & 1 deletion assets/optional/multus/release-multus-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.18.0-0.nightly-2024-09-23-182657"
"base": "4.18.0-0.nightly-2024-09-29-150556"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c2184410d2afe1ae682931d0e213aa8743b757440379caac425833e56f831726",
Expand Down
2 changes: 1 addition & 1 deletion assets/optional/operator-lifecycle-manager/0000_50_olm_00-catalogsources.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.1
controller-gen.kubebuilder.io/version: v0.16.3
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
capability.openshift.io/name: "OperatorLifecycleManager"
Expand Down
2 changes: 1 addition & 1 deletion assets/optional/operator-lifecycle-manager/0000_50_olm_00-clusterserviceversions.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.1
controller-gen.kubebuilder.io/version: v0.16.3
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
capability.openshift.io/name: "OperatorLifecycleManager"
Expand Down
2 changes: 1 addition & 1 deletion assets/optional/operator-lifecycle-manager/0000_50_olm_00-installplans.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.1
controller-gen.kubebuilder.io/version: v0.16.3
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
capability.openshift.io/name: "OperatorLifecycleManager"
Expand Down
2 changes: 1 addition & 1 deletion assets/optional/operator-lifecycle-manager/0000_50_olm_00-olmconfigs.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.1
controller-gen.kubebuilder.io/version: v0.16.3
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
capability.openshift.io/name: "OperatorLifecycleManager"
Expand Down
2 changes: 1 addition & 1 deletion assets/optional/operator-lifecycle-manager/0000_50_olm_00-operatorconditions.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.1
controller-gen.kubebuilder.io/version: v0.16.3
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
capability.openshift.io/name: "OperatorLifecycleManager"
Expand Down
2 changes: 1 addition & 1 deletion assets/optional/operator-lifecycle-manager/0000_50_olm_00-operatorgroups.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.1
controller-gen.kubebuilder.io/version: v0.16.3
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
capability.openshift.io/name: "OperatorLifecycleManager"
Expand Down
2 changes: 1 addition & 1 deletion assets/optional/operator-lifecycle-manager/0000_50_olm_00-operators.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.1
controller-gen.kubebuilder.io/version: v0.16.3
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
capability.openshift.io/name: "OperatorLifecycleManager"
Expand Down
2 changes: 1 addition & 1 deletion assets/optional/operator-lifecycle-manager/0000_50_olm_00-subscriptions.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.1
controller-gen.kubebuilder.io/version: v0.16.3
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
capability.openshift.io/name: "OperatorLifecycleManager"
Expand Down
8 changes: 4 additions & 4 deletions assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
images:
- name: quay.io/operator-framework/olm
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:195f9e4d669ddb38536fc21e50b4b6dc4fbd22a26b732ac282debac6d9a4bf7b
digest: sha256:c73712d57f979bb5c1f4ea54898e47697ccbc7b6c035e482330df77bbb54aec1
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:7f3fd3f5fa9f28a72cbd0be24b13f876c4969d740af71c06181a03c33bc4203a
digest: sha256:55318acbbaaab5e9585be4a98359ab766590b4f0c252de579150ab7c74319fec
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:bdb8a3dd3a5885a3fab5df1395cbd6097fb78a05de56c27d2cd7e20efaedbe98
Expand All @@ -16,12 +16,12 @@ patches:
path: /spec/template/spec/containers/0/env/-
value:
name: OPERATOR_REGISTRY_IMAGE
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7f3fd3f5fa9f28a72cbd0be24b13f876c4969d740af71c06181a03c33bc4203a
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:55318acbbaaab5e9585be4a98359ab766590b4f0c252de579150ab7c74319fec
- op: add
path: /spec/template/spec/containers/0/env/-
value:
name: OLM_IMAGE
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:195f9e4d669ddb38536fc21e50b4b6dc4fbd22a26b732ac282debac6d9a4bf7b
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c73712d57f979bb5c1f4ea54898e47697ccbc7b6c035e482330df77bbb54aec1
target:
kind: Deployment
labelSelector: app=catalog-operator
8 changes: 4 additions & 4 deletions assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
images:
- name: quay.io/operator-framework/olm
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:e7b325764bcf641993415676dc63eda6819880575abb48969abc1155cd5024ca
digest: sha256:3ae38975ae4d9a4414d1e9c68915d2e1d232511a506a6e1d06b4f5e09716f6ca
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:0c4ff05cb72f204637ca90c4cead078b78ce4466537126af6aa8376404ec2e7c
digest: sha256:e8afe381e35d664e7c22a471313ce3bc65fad241ee06124341bbf6ff9dcf1d77
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:ddce118a3ffd626fe3e162754d512c58a1b4883515b09b4d81caa22b677e2307
Expand All @@ -16,12 +16,12 @@ patches:
path: /spec/template/spec/containers/0/env/-
value:
name: OPERATOR_REGISTRY_IMAGE
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0c4ff05cb72f204637ca90c4cead078b78ce4466537126af6aa8376404ec2e7c
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e8afe381e35d664e7c22a471313ce3bc65fad241ee06124341bbf6ff9dcf1d77
- op: add
path: /spec/template/spec/containers/0/env/-
value:
name: OLM_IMAGE
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e7b325764bcf641993415676dc63eda6819880575abb48969abc1155cd5024ca
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3ae38975ae4d9a4414d1e9c68915d2e1d232511a506a6e1d06b4f5e09716f6ca
target:
kind: Deployment
labelSelector: app=catalog-operator
6 changes: 3 additions & 3 deletions assets/optional/operator-lifecycle-manager/release-olm-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": {
"base": "4.18.0-0.nightly-arm64-2024-09-27-000855"
"base": "4.18.0-0.nightly-arm64-2024-09-29-233859"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:195f9e4d669ddb38536fc21e50b4b6dc4fbd22a26b732ac282debac6d9a4bf7b",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7f3fd3f5fa9f28a72cbd0be24b13f876c4969d740af71c06181a03c33bc4203a",
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c73712d57f979bb5c1f4ea54898e47697ccbc7b6c035e482330df77bbb54aec1",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:55318acbbaaab5e9585be4a98359ab766590b4f0c252de579150ab7c74319fec",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bdb8a3dd3a5885a3fab5df1395cbd6097fb78a05de56c27d2cd7e20efaedbe98"
}
}
6 changes: 3 additions & 3 deletions assets/optional/operator-lifecycle-manager/release-olm-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": {
"base": "4.18.0-0.nightly-2024-09-23-182657"
"base": "4.18.0-0.nightly-2024-09-29-150556"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e7b325764bcf641993415676dc63eda6819880575abb48969abc1155cd5024ca",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0c4ff05cb72f204637ca90c4cead078b78ce4466537126af6aa8376404ec2e7c",
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3ae38975ae4d9a4414d1e9c68915d2e1d232511a506a6e1d06b4f5e09716f6ca",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e8afe381e35d664e7c22a471313ce3bc65fad241ee06124341bbf6ff9dcf1d77",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ddce118a3ffd626fe3e162754d512c58a1b4883515b09b4d81caa22b677e2307"
}
}
4 changes: 2 additions & 2 deletions assets/release/release-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"release": {
"base": "4.18.0-0.nightly-arm64-2024-09-27-000855"
"base": "4.18.0-0.nightly-arm64-2024-09-29-233859"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0a8e175cac0f0229166d5e97a0c43eab60d90023a4cbf269b898d90f08111c19",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7900670845b19f28e6dfadfa8efb0c7111487d41690ae6ce74098ffc1c74c18a",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a7869c9e060124b06c4486138ed1f19fc45e7cbf8a91ffa37059d8654f36ef88",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5f44f25911cdf4775490eb0242185ec084f5ed70ae32969e33203bc5d284462a",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bdb8a3dd3a5885a3fab5df1395cbd6097fb78a05de56c27d2cd7e20efaedbe98",
Expand Down
6 changes: 3 additions & 3 deletions assets/release/release-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"release": {
"base": "4.18.0-0.nightly-2024-09-23-182657"
"base": "4.18.0-0.nightly-2024-09-29-150556"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3edf3c693cfc79da6c1c6dda374307e3df94f7dbb9cad1c4fcc40d1419018198",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1c2c63d66669138e688c5259b8180dde2bf8847c5f78e2a6850408b35a8a91b8",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:14739663e72485d7746c10f47726672226e9594b3c5b2c51f8f1295e1416512c",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:11c644a2788763eccd0df75e7dbfaae12b8a8f9363080e158af4b142005a8ce0",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ddce118a3ffd626fe3e162754d512c58a1b4883515b09b4d81caa22b677e2307",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dbae6a3ee56ada7c58f5c49b8c457cea56860241302725ceacd2860f0e630bce",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:654bbec52fff0eb1d5541ec5259ac70f6a3d4e6f3f7df7de6b344a9e135f048a",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:83a6c4667904c63c6531026b03de23bf3c2bb30d5174043bf38374e7c5ddb806",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2e29c65ce36d9e085364ce61ec901c731fb370d104d7b6f81fcb829875f213e1",
"lvms_operator": "quay.io/lvms_dev/lvms4-lvms-rhel9-operator@sha256:86f0b8a3a1a699feff2d77d57b0917eaae501086b91c8ae3cbf31e5454967089",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ab451c506f5a46dcb90ac2b6beeec9ed9d765569f2f452f31d8560b0123cdf16",
Expand Down
Loading