Skip to content

Commit c01527f

Browse files
microshift-rebase-script[bot]ci-robot
andauthored
NO-ISSUE: rebase-release-4.20-4.20.0-0.nightly-2026-04-12-155344_amd64-2026-04-12_arm64-2026-04-12 (#6494)
* update last_rebase.sh * update changelog * update component images * update manifests * update buildfiles * Update AI Model Serving for MicroShift --------- Co-authored-by: ci-robot <ci-robot@openshift.io>
1 parent 77fd4e2 commit c01527f

17 files changed

Lines changed: 52 additions & 61 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.20.0-0.nightly-arm64-2026-04-08-203827
1+
OCP_VERSION := 4.20.0-0.nightly-arm64-2026-04-12-232434

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-08-123030
1+
OCP_VERSION := 4.20.0-0.nightly-2026-04-12-155344

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:b94bc3ed7f80b2734af4571c885ded2721fc52f65f3b5322675f7235a8af36e2
5+
digest: sha256:9d39319f34ea09f249596739afe5acee4ca5dc8154d9df6e8e0d65a383fef746
66
- name: containernetworking-plugins-microshift
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:1dca627f3c4175449d1049a034224afc75ef2995dc17b3d581f349e9c32dd008
8+
digest: sha256:8ceb590bb61ccbbe871ec2bdeac756abfa1efcb7f29ab200b18515806b761d85

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:4fc6187f90f9a47601e0db8444df711c83276bbce731294686d25ce43bf417ce
5+
digest: sha256:f8df4254c9bec0909778fa69076404dd9ad934a7474dade75dc7b9a7fcd08fd6
66
- name: containernetworking-plugins-microshift
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:3ee119353fcfdc02fa66a839828e884e508a755f03181a7505314a0dded70019
8+
digest: sha256:534637a68eb5755658d95cd6bd243a74051a17414bf65f543abd02b84e13a610
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-08-203827"
3+
"base": "4.20.0-0.nightly-arm64-2026-04-12-232434"
44
},
55
"images": {
6-
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b94bc3ed7f80b2734af4571c885ded2721fc52f65f3b5322675f7235a8af36e2",
7-
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1dca627f3c4175449d1049a034224afc75ef2995dc17b3d581f349e9c32dd008"
6+
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9d39319f34ea09f249596739afe5acee4ca5dc8154d9df6e8e0d65a383fef746",
7+
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8ceb590bb61ccbbe871ec2bdeac756abfa1efcb7f29ab200b18515806b761d85"
88
}
99
}
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-08-123030"
3+
"base": "4.20.0-0.nightly-2026-04-12-155344"
44
},
55
"images": {
6-
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4fc6187f90f9a47601e0db8444df711c83276bbce731294686d25ce43bf417ce",
7-
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3ee119353fcfdc02fa66a839828e884e508a755f03181a7505314a0dded70019"
6+
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f8df4254c9bec0909778fa69076404dd9ad934a7474dade75dc7b9a7fcd08fd6",
7+
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:534637a68eb5755658d95cd6bd243a74051a17414bf65f543abd02b84e13a610"
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:1b61799cd261ea7da30778806a0d4f3c1c0554433fad6fc302c9daa615e67263
5+
digest: sha256:97cd86f4e964320607f5c1dbf9dd54139227c725156b35bc4fdd8e127cb51a9f
66
- name: quay.io/operator-framework/configmap-operator-registry
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:6b024eb28d475e1a351f9f548f92cf49e39641f47d0d494f50a95241e90bf5fc
8+
digest: sha256:206c8068e509fdd0ee72602df64f1f9d97a8749268c2ef95cc548e1fd8573a00
99
- name: quay.io/openshift/origin-kube-rbac-proxy
1010
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
11-
digest: sha256:6a9dcfe5e522ece0acd9d7f3631d33eba0ac0439094b6c6eca29a3b0b2b39c3e
11+
digest: sha256:763fa31b1e25b19ad6ae5a328287e3ecf98eba9cb2f03b7eebe08581d8760bda
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:6b024eb28d475e1a351f9f548f92cf49e39641f47d0d494f50a95241e90bf5fc
19+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:206c8068e509fdd0ee72602df64f1f9d97a8749268c2ef95cc548e1fd8573a00
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:1b61799cd261ea7da30778806a0d4f3c1c0554433fad6fc302c9daa615e67263
24+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:97cd86f4e964320607f5c1dbf9dd54139227c725156b35bc4fdd8e127cb51a9f
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:c5b7350ef5103fef1e9541718b88dee799d78479cf6424f602b97c452e7a3d0f
5+
digest: sha256:d59306dd2398a43e7a3cfd9d7fd6cd4ec4eeb4ea0917c7af4820f491f246d95b
66
- name: quay.io/operator-framework/configmap-operator-registry
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:3c7a1a8b83d421e3b346138d4ce45fadcb2128fea1af1d850ad993d0ba0cd471
8+
digest: sha256:c85fbb56c48f868133c46e5b0b7f8bbf4a455805408ae9fa82cd55d483c882b6
99
- name: quay.io/openshift/origin-kube-rbac-proxy
1010
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
11-
digest: sha256:004b10f98db9a1e788a34e98271322e9ff4d4ec3401947d7be57397d2c12e55a
11+
digest: sha256:6371cc2ef384f6fd19746a64c01066e7cd06d6c62f0a9e63ade23ef78fc13885
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:3c7a1a8b83d421e3b346138d4ce45fadcb2128fea1af1d850ad993d0ba0cd471
19+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c85fbb56c48f868133c46e5b0b7f8bbf4a455805408ae9fa82cd55d483c882b6
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:c5b7350ef5103fef1e9541718b88dee799d78479cf6424f602b97c452e7a3d0f
24+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d59306dd2398a43e7a3cfd9d7fd6cd4ec4eeb4ea0917c7af4820f491f246d95b
2525
target:
2626
kind: Deployment
2727
labelSelector: app=catalog-operator
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-08-203827"
3+
"base": "4.20.0-0.nightly-arm64-2026-04-12-232434"
44
},
55
"images": {
6-
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1b61799cd261ea7da30778806a0d4f3c1c0554433fad6fc302c9daa615e67263",
7-
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6b024eb28d475e1a351f9f548f92cf49e39641f47d0d494f50a95241e90bf5fc",
8-
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6a9dcfe5e522ece0acd9d7f3631d33eba0ac0439094b6c6eca29a3b0b2b39c3e"
6+
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:97cd86f4e964320607f5c1dbf9dd54139227c725156b35bc4fdd8e127cb51a9f",
7+
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:206c8068e509fdd0ee72602df64f1f9d97a8749268c2ef95cc548e1fd8573a00",
8+
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:763fa31b1e25b19ad6ae5a328287e3ecf98eba9cb2f03b7eebe08581d8760bda"
99
}
1010
}

0 commit comments

Comments
 (0)