Skip to content

Commit 47f3632

Browse files
microshift-rebase-script[bot]ci-robot
microshift-rebase-script[bot]
and
ci-robot
authored
NO-ISSUE: rebase-release-4.20-4.20.0-0.nightly-2026-04-19-193153_amd64-2026-04-19_arm64-2026-04-20 (#6535)
* update last_rebase.sh * update changelog * update microshift/go.mod * update microshift/deps * update microshift/vendor * update etcd/go.mod * update etcd/vendor * update component images * update manifests * update buildfiles * update kubernetes version in CNCF scripts --------- Co-authored-by: ci-robot <ci-robot@openshift.io>
1 parent 0234251 commit 47f3632

34 files changed

Lines changed: 462 additions & 246 deletions

File tree

‎Makefile.kube_git.var‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
KUBE_GIT_MAJOR=1
22
KUBE_GIT_MINOR=33
3-
KUBE_GIT_VERSION=v1.33.9
4-
KUBE_GIT_COMMIT=51bc740cd4e090500ccdff94eda526ceddf3d2a9
3+
KUBE_GIT_VERSION=v1.33.10
4+
KUBE_GIT_COMMIT=2d92ab7b3cb444e41ec6d5edf64dfe3b22d93142
55
KUBE_GIT_TREE_STATE=clean

‎Makefile.version.aarch64.var‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
OCP_VERSION := 4.20.0-0.nightly-arm64-2026-04-16-005509
1+
OCP_VERSION := 4.20.0-0.nightly-arm64-2026-04-20-001822

‎Makefile.version.x86_64.var‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
OCP_VERSION := 4.20.0-0.nightly-2026-04-15-065519
1+
OCP_VERSION := 4.20.0-0.nightly-2026-04-19-193153

‎assets/components/multus/kustomization.aarch64.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
images:
33
- name: multus-cni-microshift
44
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
5-
digest: sha256:b5f44986979892e495e7cc076230960dea81dd8e376c4dcd4fa9a7dc97eab0ef
5+
digest: sha256:ce20aed1ab3c8eca530239717ea88ec01d37b4a9a5cc1998e9cba06a1fb2b272
66
- name: containernetworking-plugins-microshift
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:e5ff41630d3248b8aa93e318d654283ad86a269bcf3fd26726801fb9c6fd44e7
8+
digest: sha256:ed6958475fcb33e815e770acddfb192b7ceeb2e9cbcf9f8b30d36bcba36788b1

‎assets/components/multus/kustomization.x86_64.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
images:
33
- name: multus-cni-microshift
44
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
5-
digest: sha256:d0862ddeb183db64cd8a6d0e028a35012c12038fb1b4d6541871e01d9914ab9c
5+
digest: sha256:9efa21cdb0684b2defa3fab36940deade392915e0c29d283274fdfdf002c30a7
66
- name: containernetworking-plugins-microshift
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:a3bdef6e51a91bf881d2508cb588e31db62d9953a85a62e213ef9e053d70e96a
8+
digest: sha256:55ac4a0108f5d1b55d402f15cf4f98f92ca3d816afd4658c70bc88db887dc1eb

‎assets/components/multus/release-multus-aarch64.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"release": {
3-
"base": "4.20.0-0.nightly-arm64-2026-04-16-005509"
3+
"base": "4.20.0-0.nightly-arm64-2026-04-20-001822"
44
},
55
"images": {
6-
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b5f44986979892e495e7cc076230960dea81dd8e376c4dcd4fa9a7dc97eab0ef",
7-
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e5ff41630d3248b8aa93e318d654283ad86a269bcf3fd26726801fb9c6fd44e7"
6+
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ce20aed1ab3c8eca530239717ea88ec01d37b4a9a5cc1998e9cba06a1fb2b272",
7+
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ed6958475fcb33e815e770acddfb192b7ceeb2e9cbcf9f8b30d36bcba36788b1"
88
}
99
}

‎assets/components/multus/release-multus-x86_64.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"release": {
3-
"base": "4.20.0-0.nightly-2026-04-15-065519"
3+
"base": "4.20.0-0.nightly-2026-04-19-193153"
44
},
55
"images": {
6-
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d0862ddeb183db64cd8a6d0e028a35012c12038fb1b4d6541871e01d9914ab9c",
7-
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a3bdef6e51a91bf881d2508cb588e31db62d9953a85a62e213ef9e053d70e96a"
6+
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9efa21cdb0684b2defa3fab36940deade392915e0c29d283274fdfdf002c30a7",
7+
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:55ac4a0108f5d1b55d402f15cf4f98f92ca3d816afd4658c70bc88db887dc1eb"
88
}
99
}

‎assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,26 @@
22
images:
33
- name: quay.io/operator-framework/olm
44
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
5-
digest: sha256:29294381eb7c291a8a02c8f2cc94c9369b636d14b67769e973b304aa1241dbf2
5+
digest: sha256:0edb00e38281dbd6ebe11978634060c4aadb76b7985bb3645438066612d73519
66
- name: quay.io/operator-framework/configmap-operator-registry
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:7bb9b3f60b8259e83121df96c80bec2cfe218f5d6362828a01bff915d35d52ad
8+
digest: sha256:a7a71f70a4d5c09a0579caa1fdbb03bbbe6004eef7fc78785f7e68d8e757c34e
99
- name: quay.io/openshift/origin-kube-rbac-proxy
1010
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
11-
digest: sha256:537cc9f58922af85a3420ffa016c0802dc1ffc0af55b3d3a70ae733a7d70e14b
11+
digest: sha256:15d8fa886585e7fb17038247822209a441e40daf07b655ec206da40b38b2e54c
1212

1313
patches:
1414
- patch: |-
1515
- op: add
1616
path: /spec/template/spec/containers/0/env/-
1717
value:
1818
name: OPERATOR_REGISTRY_IMAGE
19-
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7bb9b3f60b8259e83121df96c80bec2cfe218f5d6362828a01bff915d35d52ad
19+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a7a71f70a4d5c09a0579caa1fdbb03bbbe6004eef7fc78785f7e68d8e757c34e
2020
- op: add
2121
path: /spec/template/spec/containers/0/env/-
2222
value:
2323
name: OLM_IMAGE
24-
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:29294381eb7c291a8a02c8f2cc94c9369b636d14b67769e973b304aa1241dbf2
24+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0edb00e38281dbd6ebe11978634060c4aadb76b7985bb3645438066612d73519
2525
target:
2626
kind: Deployment
2727
labelSelector: app=catalog-operator

‎assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,26 @@
22
images:
33
- name: quay.io/operator-framework/olm
44
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
5-
digest: sha256:f596c54e96ab5a345df7a8cf1a14c953d39b3b43423c6b3002ba98df2c2fd0a2
5+
digest: sha256:558484053fad340cce2b883f13d74e5fd8e22fa0c4d2a8d1cd3c767258fa9b66
66
- name: quay.io/operator-framework/configmap-operator-registry
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:a3a48b734b960f0231b8efb31ec3c63e746255e8d9879e908af02332df60533d
8+
digest: sha256:b9a1bbc2c05c057f43479a399224847419008f233873066f7a12030849f9dd1b
99
- name: quay.io/openshift/origin-kube-rbac-proxy
1010
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
11-
digest: sha256:0c1b871a1e7148de8d1101e925186df33318adc5adffbaba3f2f13af71b08367
11+
digest: sha256:d24c15048c1d789f27aad26e3c6a9a75fcf9e1f6370edb2d02ec50a931e0854f
1212

1313
patches:
1414
- patch: |-
1515
- op: add
1616
path: /spec/template/spec/containers/0/env/-
1717
value:
1818
name: OPERATOR_REGISTRY_IMAGE
19-
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a3a48b734b960f0231b8efb31ec3c63e746255e8d9879e908af02332df60533d
19+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b9a1bbc2c05c057f43479a399224847419008f233873066f7a12030849f9dd1b
2020
- op: add
2121
path: /spec/template/spec/containers/0/env/-
2222
value:
2323
name: OLM_IMAGE
24-
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f596c54e96ab5a345df7a8cf1a14c953d39b3b43423c6b3002ba98df2c2fd0a2
24+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:558484053fad340cce2b883f13d74e5fd8e22fa0c4d2a8d1cd3c767258fa9b66
2525
target:
2626
kind: Deployment
2727
labelSelector: app=catalog-operator

‎assets/optional/operator-lifecycle-manager/release-olm-aarch64.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"release": {
3-
"base": "4.20.0-0.nightly-arm64-2026-04-16-005509"
3+
"base": "4.20.0-0.nightly-arm64-2026-04-20-001822"
44
},
55
"images": {
6-
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:29294381eb7c291a8a02c8f2cc94c9369b636d14b67769e973b304aa1241dbf2",
7-
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7bb9b3f60b8259e83121df96c80bec2cfe218f5d6362828a01bff915d35d52ad",
8-
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:537cc9f58922af85a3420ffa016c0802dc1ffc0af55b3d3a70ae733a7d70e14b"
6+
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0edb00e38281dbd6ebe11978634060c4aadb76b7985bb3645438066612d73519",
7+
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a7a71f70a4d5c09a0579caa1fdbb03bbbe6004eef7fc78785f7e68d8e757c34e",
8+
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:15d8fa886585e7fb17038247822209a441e40daf07b655ec206da40b38b2e54c"
99
}
1010
}

0 commit comments

Comments
 (0)