Skip to content

Commit d9f8edc

Browse files
microshift-rebase-script[bot]ci-robot
andauthored
NO-ISSUE: rebase-release-4.18-4.18.0-0.nightly-2026-04-12-151606_amd64-2026-04-12_arm64-2026-04-12 (#6492)
* update last_rebase.sh * update changelog * update component images * update manifests * update buildfiles --------- Co-authored-by: ci-robot <ci-robot@openshift.io>
1 parent af7b3bf commit d9f8edc

16 files changed

Lines changed: 51 additions & 54 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.18.0-0.nightly-arm64-2026-04-09-013854
1+
OCP_VERSION := 4.18.0-0.nightly-arm64-2026-04-12-232347

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.18.0-0.nightly-2026-04-08-133854
1+
OCP_VERSION := 4.18.0-0.nightly-2026-04-12-151606

assets/optional/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:9aad8091db1baa23c3773ed90f4a656bdebd3bfbc86aba9cbf7659ae5b859377
5+
digest: sha256:666b635f57e82a7735c0cfc6b0efe630db2bc61de19f99140e925efe8d6dec10
66
- name: containernetworking-plugins-microshift
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:3078f4ee93d823b4ef40bf293ea08e2013c004be4df7ea1e5ce95d8aed94d867
8+
digest: sha256:952ad268b8f3adb3e0cf5c97a5a68ffceea43b2c817e956a551c6cf2ab4e67d0

assets/optional/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:e63d8c611061ebbace022250d0c80baf0048115f83ec1f7cedd91bdd734fe235
5+
digest: sha256:e99a62befac81c7f39bdeba8a8acbf1cd6f4a2db645fc3fc7f8f3025ef4b8d74
66
- name: containernetworking-plugins-microshift
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:149626d0a32922e048616c3ccd35414409a056c9571b67d62b3f27c1ef443881
8+
digest: sha256:91065fad3cb01d95ac1d3c4bcac50aeb79e07c7f4b7ef6cb24c6bb3cc1fe3600
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"release": {
3-
"base": "4.18.0-0.nightly-arm64-2026-04-09-013854"
3+
"base": "4.18.0-0.nightly-arm64-2026-04-12-232347"
44
},
55
"images": {
6-
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9aad8091db1baa23c3773ed90f4a656bdebd3bfbc86aba9cbf7659ae5b859377",
7-
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3078f4ee93d823b4ef40bf293ea08e2013c004be4df7ea1e5ce95d8aed94d867"
6+
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:666b635f57e82a7735c0cfc6b0efe630db2bc61de19f99140e925efe8d6dec10",
7+
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:952ad268b8f3adb3e0cf5c97a5a68ffceea43b2c817e956a551c6cf2ab4e67d0"
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.18.0-0.nightly-2026-04-08-133854"
3+
"base": "4.18.0-0.nightly-2026-04-12-151606"
44
},
55
"images": {
6-
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e63d8c611061ebbace022250d0c80baf0048115f83ec1f7cedd91bdd734fe235",
7-
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:149626d0a32922e048616c3ccd35414409a056c9571b67d62b3f27c1ef443881"
6+
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e99a62befac81c7f39bdeba8a8acbf1cd6f4a2db645fc3fc7f8f3025ef4b8d74",
7+
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:91065fad3cb01d95ac1d3c4bcac50aeb79e07c7f4b7ef6cb24c6bb3cc1fe3600"
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:c62f00fca831aff520c24ede07e49434ee323458a292bc47f236f6c9f1c153da
5+
digest: sha256:8431749c5f9a226869e81d844e8e1d4c4eb3a9d65ea0724ce184900b8f0120f5
66
- name: quay.io/operator-framework/configmap-operator-registry
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:ae131cc145f0aaf04b822da3fdbc05ca4d1a4743993d1bda4be62419377d8afe
8+
digest: sha256:45b3d7bcb23fa939cdc3588eab7c1827d64324ef8455764bcc1e2d9fed9dec89
99
- name: quay.io/openshift/origin-kube-rbac-proxy
1010
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
11-
digest: sha256:24f8687437873faedbd31738a8d1ecd89257821f9605de6478caedddccd7832c
11+
digest: sha256:78e6715b278d1e8ff18a12b1adda7f406253fccc0bf86a8b849e2a2bfa49e299
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:ae131cc145f0aaf04b822da3fdbc05ca4d1a4743993d1bda4be62419377d8afe
19+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:45b3d7bcb23fa939cdc3588eab7c1827d64324ef8455764bcc1e2d9fed9dec89
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:c62f00fca831aff520c24ede07e49434ee323458a292bc47f236f6c9f1c153da
24+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8431749c5f9a226869e81d844e8e1d4c4eb3a9d65ea0724ce184900b8f0120f5
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:766c2d511c45f8e0ba7bb08fd4010881de48118eb07d3252cc194cfe73cc5c50
5+
digest: sha256:1e05a555379ec0108ce2ab5c5bf83c9c0ec3b16150735e631cc0ef44f4ec268d
66
- name: quay.io/operator-framework/configmap-operator-registry
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:5acd4d054d2733be02c418628ed1dd7286af51feb3f7a7456964865a49f0312b
8+
digest: sha256:7aac2a59934f7f1c5cc030e6ee692e36b8aa17e0d9eb9f40d83e7c1224f5f03b
99
- name: quay.io/openshift/origin-kube-rbac-proxy
1010
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
11-
digest: sha256:6270b6a9ec638820da59f4ea62db6488439dd1ad4234dff7d72c5409e8586103
11+
digest: sha256:64800896219cd3c657b06747813308f89e4a4fe49e69eb57e2d6b9d9ae18af72
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:5acd4d054d2733be02c418628ed1dd7286af51feb3f7a7456964865a49f0312b
19+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7aac2a59934f7f1c5cc030e6ee692e36b8aa17e0d9eb9f40d83e7c1224f5f03b
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:766c2d511c45f8e0ba7bb08fd4010881de48118eb07d3252cc194cfe73cc5c50
24+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1e05a555379ec0108ce2ab5c5bf83c9c0ec3b16150735e631cc0ef44f4ec268d
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.18.0-0.nightly-arm64-2026-04-09-013854"
3+
"base": "4.18.0-0.nightly-arm64-2026-04-12-232347"
44
},
55
"images": {
6-
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c62f00fca831aff520c24ede07e49434ee323458a292bc47f236f6c9f1c153da",
7-
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ae131cc145f0aaf04b822da3fdbc05ca4d1a4743993d1bda4be62419377d8afe",
8-
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:24f8687437873faedbd31738a8d1ecd89257821f9605de6478caedddccd7832c"
6+
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8431749c5f9a226869e81d844e8e1d4c4eb3a9d65ea0724ce184900b8f0120f5",
7+
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:45b3d7bcb23fa939cdc3588eab7c1827d64324ef8455764bcc1e2d9fed9dec89",
8+
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:78e6715b278d1e8ff18a12b1adda7f406253fccc0bf86a8b849e2a2bfa49e299"
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.18.0-0.nightly-2026-04-08-133854"
3+
"base": "4.18.0-0.nightly-2026-04-12-151606"
44
},
55
"images": {
6-
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:766c2d511c45f8e0ba7bb08fd4010881de48118eb07d3252cc194cfe73cc5c50",
7-
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5acd4d054d2733be02c418628ed1dd7286af51feb3f7a7456964865a49f0312b",
8-
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6270b6a9ec638820da59f4ea62db6488439dd1ad4234dff7d72c5409e8586103"
6+
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1e05a555379ec0108ce2ab5c5bf83c9c0ec3b16150735e631cc0ef44f4ec268d",
7+
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7aac2a59934f7f1c5cc030e6ee692e36b8aa17e0d9eb9f40d83e7c1224f5f03b",
8+
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:64800896219cd3c657b06747813308f89e4a4fe49e69eb57e2d6b9d9ae18af72"
99
}
1010
}

0 commit comments

Comments
 (0)