Skip to content

Commit 7f7539e

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-15-070853_amd64-2026-04-15_arm64-2026-04-16 (#6509)
* update last_rebase.sh * update changelog * update component images * update manifests * update buildfiles --------- Co-authored-by: ci-robot <ci-robot@openshift.io>
1 parent 483e5b2 commit 7f7539e

17 files changed

+73
-55
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-13-003017
1+
OCP_VERSION := 4.21.0-0.nightly-arm64-2026-04-16-010853

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

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

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

‎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-13-003017"
3+
"base": "4.21.0-0.nightly-arm64-2026-04-16-010853"
44
},
55
"images": {
6-
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e8daa4bd61c96768c266aa748b5b30fd2af3281371afb7277d74a5b6d20c18fa",
7-
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:97bc41e1bc4918d73f08f3dd80b23a0c3d399fd450df852bdfa250b679d2b476"
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"
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-09-054358"
3+
"base": "4.21.0-0.nightly-2026-04-15-070853"
44
},
55
"images": {
6-
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d48e7da76868a6c9dae5ecb6ea7e7c58ce3ea71c202995fb7125b6aec5dc7e9e",
7-
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:33ab0262eae4278196667059950c32cebfcf68fad929b9393789bbefb4e7021b"
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"
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:efe8c8ada5cca322b4acc721a86711d662946d789df34bc52163f49554751abe
5+
digest: sha256:caa8e45a9b3cbe0540fc33e6dd521b36893c98a1c9d436280a5ee5a1fcef368a
66
- name: quay.io/operator-framework/configmap-operator-registry
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:2919a03d1712f168c321f1d9f94f6c24b479abcc0c17384a51a9d72b6b0f0ae2
8+
digest: sha256:feb979326efdb69914daf2c683a339f17a048c728b97da1e3c7e42aab5cef5fa
99
- name: quay.io/openshift/origin-kube-rbac-proxy
1010
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
11-
digest: sha256:8dc94f798798f68f6f67de5d7eee78baac10ca070e146244ca6b0db0f2000cee
11+
digest: sha256:a5f3823b6edc4bb9e59bd082c14c33aec5cab28e176323a9f09bb441918ae5ff
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:2919a03d1712f168c321f1d9f94f6c24b479abcc0c17384a51a9d72b6b0f0ae2
19+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:feb979326efdb69914daf2c683a339f17a048c728b97da1e3c7e42aab5cef5fa
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:efe8c8ada5cca322b4acc721a86711d662946d789df34bc52163f49554751abe
24+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:caa8e45a9b3cbe0540fc33e6dd521b36893c98a1c9d436280a5ee5a1fcef368a
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:bba0c14ebbfb5f5e71204ee957fbfe8a2be15761e345569b6d0e3c8df8081999
5+
digest: sha256:39b3bb03fca170e0bc2850a56fd52a58595e7d853499d549935de1787edfcbeb
66
- name: quay.io/operator-framework/configmap-operator-registry
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:7d896ace54972538caa1d44eb014f88a71b678baedbf97154ea023955f04f107
8+
digest: sha256:8d34efba6316ff015a5cbd96618687ec013d9d7bbc6acbdc6b7755212ac2c5e9
99
- name: quay.io/openshift/origin-kube-rbac-proxy
1010
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
11-
digest: sha256:d2d1c422773fc76478595cdbc8a255f94345c1187251dc5885c12f1c9462991b
11+
digest: sha256:8ed83b8250364f976ff1e3615e5319db83151410018c789e76eed958e77e57c0
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:7d896ace54972538caa1d44eb014f88a71b678baedbf97154ea023955f04f107
19+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8d34efba6316ff015a5cbd96618687ec013d9d7bbc6acbdc6b7755212ac2c5e9
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:bba0c14ebbfb5f5e71204ee957fbfe8a2be15761e345569b6d0e3c8df8081999
24+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:39b3bb03fca170e0bc2850a56fd52a58595e7d853499d549935de1787edfcbeb
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-13-003017"
3+
"base": "4.21.0-0.nightly-arm64-2026-04-16-010853"
44
},
55
"images": {
6-
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:efe8c8ada5cca322b4acc721a86711d662946d789df34bc52163f49554751abe",
7-
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2919a03d1712f168c321f1d9f94f6c24b479abcc0c17384a51a9d72b6b0f0ae2",
8-
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8dc94f798798f68f6f67de5d7eee78baac10ca070e146244ca6b0db0f2000cee"
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"
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-09-054358"
3+
"base": "4.21.0-0.nightly-2026-04-15-070853"
44
},
55
"images": {
6-
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bba0c14ebbfb5f5e71204ee957fbfe8a2be15761e345569b6d0e3c8df8081999",
7-
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7d896ace54972538caa1d44eb014f88a71b678baedbf97154ea023955f04f107",
8-
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d2d1c422773fc76478595cdbc8a255f94345c1187251dc5885c12f1c9462991b"
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"
99
}
1010
}

0 commit comments

Comments
 (0)