Skip to content

Commit 0234251

Browse files
microshift-rebase-script[bot]ci-robot
andauthored
NO-ISSUE: rebase-release-4.20-4.20.0-0.nightly-2026-04-15-065519_amd64-2026-04-15_arm64-2026-04-16 (#6510)
* update last_rebase.sh * update changelog * update component images * update manifests * update buildfiles --------- Co-authored-by: ci-robot <ci-robot@openshift.io>
1 parent c01527f commit 0234251

17 files changed

Lines changed: 55 additions & 52 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-12-232434
1+
OCP_VERSION := 4.20.0-0.nightly-arm64-2026-04-16-005509

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

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

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:f8df4254c9bec0909778fa69076404dd9ad934a7474dade75dc7b9a7fcd08fd6
5+
digest: sha256:d0862ddeb183db64cd8a6d0e028a35012c12038fb1b4d6541871e01d9914ab9c
66
- name: containernetworking-plugins-microshift
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:534637a68eb5755658d95cd6bd243a74051a17414bf65f543abd02b84e13a610
8+
digest: sha256:a3bdef6e51a91bf881d2508cb588e31db62d9953a85a62e213ef9e053d70e96a
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-12-232434"
3+
"base": "4.20.0-0.nightly-arm64-2026-04-16-005509"
44
},
55
"images": {
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"
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"
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-12-155344"
3+
"base": "4.20.0-0.nightly-2026-04-15-065519"
44
},
55
"images": {
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"
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"
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:97cd86f4e964320607f5c1dbf9dd54139227c725156b35bc4fdd8e127cb51a9f
5+
digest: sha256:29294381eb7c291a8a02c8f2cc94c9369b636d14b67769e973b304aa1241dbf2
66
- name: quay.io/operator-framework/configmap-operator-registry
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:206c8068e509fdd0ee72602df64f1f9d97a8749268c2ef95cc548e1fd8573a00
8+
digest: sha256:7bb9b3f60b8259e83121df96c80bec2cfe218f5d6362828a01bff915d35d52ad
99
- name: quay.io/openshift/origin-kube-rbac-proxy
1010
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
11-
digest: sha256:763fa31b1e25b19ad6ae5a328287e3ecf98eba9cb2f03b7eebe08581d8760bda
11+
digest: sha256:537cc9f58922af85a3420ffa016c0802dc1ffc0af55b3d3a70ae733a7d70e14b
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:206c8068e509fdd0ee72602df64f1f9d97a8749268c2ef95cc548e1fd8573a00
19+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7bb9b3f60b8259e83121df96c80bec2cfe218f5d6362828a01bff915d35d52ad
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:97cd86f4e964320607f5c1dbf9dd54139227c725156b35bc4fdd8e127cb51a9f
24+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:29294381eb7c291a8a02c8f2cc94c9369b636d14b67769e973b304aa1241dbf2
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:d59306dd2398a43e7a3cfd9d7fd6cd4ec4eeb4ea0917c7af4820f491f246d95b
5+
digest: sha256:f596c54e96ab5a345df7a8cf1a14c953d39b3b43423c6b3002ba98df2c2fd0a2
66
- name: quay.io/operator-framework/configmap-operator-registry
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:c85fbb56c48f868133c46e5b0b7f8bbf4a455805408ae9fa82cd55d483c882b6
8+
digest: sha256:a3a48b734b960f0231b8efb31ec3c63e746255e8d9879e908af02332df60533d
99
- name: quay.io/openshift/origin-kube-rbac-proxy
1010
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
11-
digest: sha256:6371cc2ef384f6fd19746a64c01066e7cd06d6c62f0a9e63ade23ef78fc13885
11+
digest: sha256:0c1b871a1e7148de8d1101e925186df33318adc5adffbaba3f2f13af71b08367
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:c85fbb56c48f868133c46e5b0b7f8bbf4a455805408ae9fa82cd55d483c882b6
19+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a3a48b734b960f0231b8efb31ec3c63e746255e8d9879e908af02332df60533d
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:d59306dd2398a43e7a3cfd9d7fd6cd4ec4eeb4ea0917c7af4820f491f246d95b
24+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f596c54e96ab5a345df7a8cf1a14c953d39b3b43423c6b3002ba98df2c2fd0a2
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-12-232434"
3+
"base": "4.20.0-0.nightly-arm64-2026-04-16-005509"
44
},
55
"images": {
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"
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"
99
}
1010
}
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-2026-04-12-155344"
3+
"base": "4.20.0-0.nightly-2026-04-15-065519"
44
},
55
"images": {
6-
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d59306dd2398a43e7a3cfd9d7fd6cd4ec4eeb4ea0917c7af4820f491f246d95b",
7-
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c85fbb56c48f868133c46e5b0b7f8bbf4a455805408ae9fa82cd55d483c882b6",
8-
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6371cc2ef384f6fd19746a64c01066e7cd06d6c62f0a9e63ade23ef78fc13885"
6+
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f596c54e96ab5a345df7a8cf1a14c953d39b3b43423c6b3002ba98df2c2fd0a2",
7+
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a3a48b734b960f0231b8efb31ec3c63e746255e8d9879e908af02332df60533d",
8+
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0c1b871a1e7148de8d1101e925186df33318adc5adffbaba3f2f13af71b08367"
99
}
1010
}

0 commit comments

Comments
 (0)