Skip to content

Commit 483e5b2

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-09-054358_amd64-2026-04-09_arm64-2026-04-13 (#6496)
* update last_rebase.sh * update changelog * update component images * update manifests * update buildfiles * Update AI Model Serving for MicroShift * Update SR-IOV for MicroShift --------- Co-authored-by: ci-robot <ci-robot@openshift.io>
1 parent 43e29fa commit 483e5b2

21 files changed

Lines changed: 94 additions & 124 deletions

‎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-08-221819
1+
OCP_VERSION := 4.21.0-0.nightly-arm64-2026-04-13-003017

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

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

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

‎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-08-221819"
3+
"base": "4.21.0-0.nightly-arm64-2026-04-13-003017"
44
},
55
"images": {
6-
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7297eac0a0686137bc4f35ce1ce32d4e18d60addf80b5c88937931e308aeac5e",
7-
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f5639fa5e31715e424d4b5b9f1138fede381268b32913543ad9e11acb37bbc86"
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"
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-08-161819"
3+
"base": "4.21.0-0.nightly-2026-04-09-054358"
44
},
55
"images": {
6-
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9e9521a481b767a9cdcb6fd19a6a141a506d70983143eeb383aaa231ba220d74",
7-
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ceb62751b04e70c7be05d528b59810ba76677b78676e1d23361ac6c2722d40a0"
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"
88
}
99
}

‎assets/optional/ai-model-serving/release-ai-model-serving-x86_64.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"release": {
3-
"base": "2.25.3"
3+
"base": "2.25.4"
44
},
55
"images": {
66
"ray-tls-generator-image": "registry.redhat.io/ubi9/ubi-minimal:latest",

‎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:397b74d9dbd41ee13fd3086b68cef358753c074749d94d1fb9f601fe74546459
5+
digest: sha256:efe8c8ada5cca322b4acc721a86711d662946d789df34bc52163f49554751abe
66
- name: quay.io/operator-framework/configmap-operator-registry
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:bb780f9676c981bab37cf21f50da40f23e64bea0886883228d1783e0fe3922fe
8+
digest: sha256:2919a03d1712f168c321f1d9f94f6c24b479abcc0c17384a51a9d72b6b0f0ae2
99
- name: quay.io/openshift/origin-kube-rbac-proxy
1010
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
11-
digest: sha256:95ef15e7f2a54fe5269412a36a2ee028e2b0276b80b84e534e5497c57cc0b801
11+
digest: sha256:8dc94f798798f68f6f67de5d7eee78baac10ca070e146244ca6b0db0f2000cee
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:bb780f9676c981bab37cf21f50da40f23e64bea0886883228d1783e0fe3922fe
19+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2919a03d1712f168c321f1d9f94f6c24b479abcc0c17384a51a9d72b6b0f0ae2
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:397b74d9dbd41ee13fd3086b68cef358753c074749d94d1fb9f601fe74546459
24+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:efe8c8ada5cca322b4acc721a86711d662946d789df34bc52163f49554751abe
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:e1d09d3bc462080fc812e2c7d3a2feb17300c468bbb6e1fdffc17a017aee53c7
5+
digest: sha256:bba0c14ebbfb5f5e71204ee957fbfe8a2be15761e345569b6d0e3c8df8081999
66
- name: quay.io/operator-framework/configmap-operator-registry
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:019fda8006d5c7298189cdcab35adeb8926a5ef2240eebaf0db2167b5c8796d8
8+
digest: sha256:7d896ace54972538caa1d44eb014f88a71b678baedbf97154ea023955f04f107
99
- name: quay.io/openshift/origin-kube-rbac-proxy
1010
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
11-
digest: sha256:60d04a021e40cba1901e74fac014755df1376a72c62b15e1d3c7e80097a054cb
11+
digest: sha256:d2d1c422773fc76478595cdbc8a255f94345c1187251dc5885c12f1c9462991b
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:019fda8006d5c7298189cdcab35adeb8926a5ef2240eebaf0db2167b5c8796d8
19+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7d896ace54972538caa1d44eb014f88a71b678baedbf97154ea023955f04f107
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:e1d09d3bc462080fc812e2c7d3a2feb17300c468bbb6e1fdffc17a017aee53c7
24+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bba0c14ebbfb5f5e71204ee957fbfe8a2be15761e345569b6d0e3c8df8081999
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-08-221819"
3+
"base": "4.21.0-0.nightly-arm64-2026-04-13-003017"
44
},
55
"images": {
6-
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:397b74d9dbd41ee13fd3086b68cef358753c074749d94d1fb9f601fe74546459",
7-
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bb780f9676c981bab37cf21f50da40f23e64bea0886883228d1783e0fe3922fe",
8-
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:95ef15e7f2a54fe5269412a36a2ee028e2b0276b80b84e534e5497c57cc0b801"
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"
99
}
1010
}

0 commit comments

Comments
 (0)