Skip to content

Commit 776c5fa

Browse files
microshift-rebase-script[bot]ci-robot
microshift-rebase-script[bot]
and
ci-robot
authored
NO-ISSUE: rebase-release-4.21-4.21.0-0.nightly-2026-04-19-143007_amd64-2026-04-19_arm64-2026-04-20 (#6536)
* update last_rebase.sh * update changelog * update component images * update manifests * update buildfiles --------- Co-authored-by: ci-robot <ci-robot@openshift.io>
1 parent 7f7539e commit 776c5fa

17 files changed

+183
-70
lines changed

‎Makefile.version.aarch64.var‎

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

‎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.21.0-0.nightly-2026-04-15-070853
1+
OCP_VERSION := 4.21.0-0.nightly-2026-04-19-143007

‎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:87d031a57582ff15a85c98dd0f11e15776d70266197f5b50e6e53a2da86f2783
5+
digest: sha256:c4d0f2f56703ed1a6022869a69150da88c954542447cf0e7d5aa770f1356f1c5
66
- name: containernetworking-plugins-microshift
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:cf2413d37c37234c9a3c8c6f38c591caae64ca093acafa5a9dda6718e525cfcf
8+
digest: sha256:234054021735699441654e7f8c5a93ef23ac840bd8306d67184cc62f0f2dc8f3

‎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:cf4adb55454e5152c3eac932eee93271618c739493fd1b0075c7fc3463350647
5+
digest: sha256:00b7b7eb6c24f7ebcb48bbc780eb25c36c844667889bbe79a1f5bc482b281f62
66
- name: containernetworking-plugins-microshift
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:d93700c87c144958fb6cd80c6264764397c8eeb2cefe3884a5b79f741e394063
8+
digest: sha256:0b14d9446043cdf46a83bc5ea64b85bfc9ffb3e165318b3e59907c6a8cef6deb

‎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.21.0-0.nightly-arm64-2026-04-16-010853"
3+
"base": "4.21.0-0.nightly-arm64-2026-04-20-030621"
44
},
55
"images": {
6-
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:87d031a57582ff15a85c98dd0f11e15776d70266197f5b50e6e53a2da86f2783",
7-
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cf2413d37c37234c9a3c8c6f38c591caae64ca093acafa5a9dda6718e525cfcf"
6+
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c4d0f2f56703ed1a6022869a69150da88c954542447cf0e7d5aa770f1356f1c5",
7+
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:234054021735699441654e7f8c5a93ef23ac840bd8306d67184cc62f0f2dc8f3"
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.21.0-0.nightly-2026-04-15-070853"
3+
"base": "4.21.0-0.nightly-2026-04-19-143007"
44
},
55
"images": {
6-
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cf4adb55454e5152c3eac932eee93271618c739493fd1b0075c7fc3463350647",
7-
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d93700c87c144958fb6cd80c6264764397c8eeb2cefe3884a5b79f741e394063"
6+
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:00b7b7eb6c24f7ebcb48bbc780eb25c36c844667889bbe79a1f5bc482b281f62",
7+
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0b14d9446043cdf46a83bc5ea64b85bfc9ffb3e165318b3e59907c6a8cef6deb"
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:caa8e45a9b3cbe0540fc33e6dd521b36893c98a1c9d436280a5ee5a1fcef368a
5+
digest: sha256:4b06663003dbdeb69f8504b0f9c2df154cf672e95f347c5fa93915e5136474a1
66
- name: quay.io/operator-framework/configmap-operator-registry
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:feb979326efdb69914daf2c683a339f17a048c728b97da1e3c7e42aab5cef5fa
8+
digest: sha256:a6f72f40e6d43ac06375adcd11539f0aa2ec20fb2d6898eb95df487cfef6ba6c
99
- name: quay.io/openshift/origin-kube-rbac-proxy
1010
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
11-
digest: sha256:a5f3823b6edc4bb9e59bd082c14c33aec5cab28e176323a9f09bb441918ae5ff
11+
digest: sha256:63ea03cf7443a50341c381b462c35a998948bb37d72e5cd8a5f49217de16fbd3
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:feb979326efdb69914daf2c683a339f17a048c728b97da1e3c7e42aab5cef5fa
19+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a6f72f40e6d43ac06375adcd11539f0aa2ec20fb2d6898eb95df487cfef6ba6c
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:caa8e45a9b3cbe0540fc33e6dd521b36893c98a1c9d436280a5ee5a1fcef368a
24+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4b06663003dbdeb69f8504b0f9c2df154cf672e95f347c5fa93915e5136474a1
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:39b3bb03fca170e0bc2850a56fd52a58595e7d853499d549935de1787edfcbeb
5+
digest: sha256:543e4b3065b5fb59e872d938e459b0551f1c65dca54ed0f884500ad215967c93
66
- name: quay.io/operator-framework/configmap-operator-registry
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:8d34efba6316ff015a5cbd96618687ec013d9d7bbc6acbdc6b7755212ac2c5e9
8+
digest: sha256:7ab739c7428ae58004f7b52da64900cd8d41d915709706d7ad75b0ebdb064014
99
- name: quay.io/openshift/origin-kube-rbac-proxy
1010
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
11-
digest: sha256:8ed83b8250364f976ff1e3615e5319db83151410018c789e76eed958e77e57c0
11+
digest: sha256:33a082238bf2c33d51fdd84cd48865183e35f4c748d6ed63f3f26888084c4c9a
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:8d34efba6316ff015a5cbd96618687ec013d9d7bbc6acbdc6b7755212ac2c5e9
19+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7ab739c7428ae58004f7b52da64900cd8d41d915709706d7ad75b0ebdb064014
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:39b3bb03fca170e0bc2850a56fd52a58595e7d853499d549935de1787edfcbeb
24+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:543e4b3065b5fb59e872d938e459b0551f1c65dca54ed0f884500ad215967c93
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.21.0-0.nightly-arm64-2026-04-16-010853"
3+
"base": "4.21.0-0.nightly-arm64-2026-04-20-030621"
44
},
55
"images": {
6-
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:caa8e45a9b3cbe0540fc33e6dd521b36893c98a1c9d436280a5ee5a1fcef368a",
7-
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:feb979326efdb69914daf2c683a339f17a048c728b97da1e3c7e42aab5cef5fa",
8-
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a5f3823b6edc4bb9e59bd082c14c33aec5cab28e176323a9f09bb441918ae5ff"
6+
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4b06663003dbdeb69f8504b0f9c2df154cf672e95f347c5fa93915e5136474a1",
7+
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a6f72f40e6d43ac06375adcd11539f0aa2ec20fb2d6898eb95df487cfef6ba6c",
8+
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:63ea03cf7443a50341c381b462c35a998948bb37d72e5cd8a5f49217de16fbd3"
99
}
1010
}

‎assets/optional/operator-lifecycle-manager/release-olm-x86_64.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.21.0-0.nightly-2026-04-15-070853"
3+
"base": "4.21.0-0.nightly-2026-04-19-143007"
44
},
55
"images": {
6-
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:39b3bb03fca170e0bc2850a56fd52a58595e7d853499d549935de1787edfcbeb",
7-
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8d34efba6316ff015a5cbd96618687ec013d9d7bbc6acbdc6b7755212ac2c5e9",
8-
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8ed83b8250364f976ff1e3615e5319db83151410018c789e76eed958e77e57c0"
6+
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:543e4b3065b5fb59e872d938e459b0551f1c65dca54ed0f884500ad215967c93",
7+
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7ab739c7428ae58004f7b52da64900cd8d41d915709706d7ad75b0ebdb064014",
8+
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:33a082238bf2c33d51fdd84cd48865183e35f4c748d6ed63f3f26888084c4c9a"
99
}
1010
}

0 commit comments

Comments
 (0)