Skip to content

Commit 9d39113

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

15 files changed

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

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

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

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:e99a62befac81c7f39bdeba8a8acbf1cd6f4a2db645fc3fc7f8f3025ef4b8d74
5+
digest: sha256:f6765ecd6a609d6b06de26d8d894c82dbafc14d915c80ce9bcb16f3d625b4e80
66
- name: containernetworking-plugins-microshift
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:91065fad3cb01d95ac1d3c4bcac50aeb79e07c7f4b7ef6cb24c6bb3cc1fe3600
8+
digest: sha256:3ae56e7a9a1b1520d0f61c0e041d2f99de3235f6800a7ee55eaf49cbd65849ab
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-12-232347"
3+
"base": "4.18.0-0.nightly-arm64-2026-04-15-191820"
44
},
55
"images": {
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"
6+
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5d6f5f78183b99d962955687ce1163ed78f8bf768bdd886081f330b5071f50fa",
7+
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4489ebdb5380905e5f80c4b341bb4e0cabe1f6768406416c6b21c07cb54b7649"
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-12-151606"
3+
"base": "4.18.0-0.nightly-2026-04-15-212456"
44
},
55
"images": {
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"
6+
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f6765ecd6a609d6b06de26d8d894c82dbafc14d915c80ce9bcb16f3d625b4e80",
7+
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3ae56e7a9a1b1520d0f61c0e041d2f99de3235f6800a7ee55eaf49cbd65849ab"
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:8431749c5f9a226869e81d844e8e1d4c4eb3a9d65ea0724ce184900b8f0120f5
5+
digest: sha256:4773b245aec6565b0bfeb1b44ad8f716254898d5058c060b523444749fbdde9c
66
- name: quay.io/operator-framework/configmap-operator-registry
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:45b3d7bcb23fa939cdc3588eab7c1827d64324ef8455764bcc1e2d9fed9dec89
8+
digest: sha256:bc1b6e64c3a1bd574f63f2e63694ffd1265771136a9784ee713ee6f5bcd7de1c
99
- name: quay.io/openshift/origin-kube-rbac-proxy
1010
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
11-
digest: sha256:78e6715b278d1e8ff18a12b1adda7f406253fccc0bf86a8b849e2a2bfa49e299
11+
digest: sha256:a2d726fa9b2d0f1996beb474453d1a8458aa9d74ed25f6f3866b2c945cc1ea81
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:45b3d7bcb23fa939cdc3588eab7c1827d64324ef8455764bcc1e2d9fed9dec89
19+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bc1b6e64c3a1bd574f63f2e63694ffd1265771136a9784ee713ee6f5bcd7de1c
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:8431749c5f9a226869e81d844e8e1d4c4eb3a9d65ea0724ce184900b8f0120f5
24+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4773b245aec6565b0bfeb1b44ad8f716254898d5058c060b523444749fbdde9c
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:1e05a555379ec0108ce2ab5c5bf83c9c0ec3b16150735e631cc0ef44f4ec268d
5+
digest: sha256:569d1c0f569eb1455631b18ddf3aaee0ea9dc5af3f7df29bdb62f54d7a6f190a
66
- name: quay.io/operator-framework/configmap-operator-registry
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:7aac2a59934f7f1c5cc030e6ee692e36b8aa17e0d9eb9f40d83e7c1224f5f03b
8+
digest: sha256:7260c4512d18a9af59d3287bb293d5d1633fbde55830397b6254e91626a09a08
99
- name: quay.io/openshift/origin-kube-rbac-proxy
1010
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
11-
digest: sha256:64800896219cd3c657b06747813308f89e4a4fe49e69eb57e2d6b9d9ae18af72
11+
digest: sha256:211054e1b5dfc556eaa545685af3d99dcbe553ef4805a8ee25a44ffc084df8ba
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:7aac2a59934f7f1c5cc030e6ee692e36b8aa17e0d9eb9f40d83e7c1224f5f03b
19+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7260c4512d18a9af59d3287bb293d5d1633fbde55830397b6254e91626a09a08
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:1e05a555379ec0108ce2ab5c5bf83c9c0ec3b16150735e631cc0ef44f4ec268d
24+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:569d1c0f569eb1455631b18ddf3aaee0ea9dc5af3f7df29bdb62f54d7a6f190a
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-12-232347"
3+
"base": "4.18.0-0.nightly-arm64-2026-04-15-191820"
44
},
55
"images": {
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"
6+
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4773b245aec6565b0bfeb1b44ad8f716254898d5058c060b523444749fbdde9c",
7+
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bc1b6e64c3a1bd574f63f2e63694ffd1265771136a9784ee713ee6f5bcd7de1c",
8+
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a2d726fa9b2d0f1996beb474453d1a8458aa9d74ed25f6f3866b2c945cc1ea81"
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-12-151606"
3+
"base": "4.18.0-0.nightly-2026-04-15-212456"
44
},
55
"images": {
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"
6+
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:569d1c0f569eb1455631b18ddf3aaee0ea9dc5af3f7df29bdb62f54d7a6f190a",
7+
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7260c4512d18a9af59d3287bb293d5d1633fbde55830397b6254e91626a09a08",
8+
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:211054e1b5dfc556eaa545685af3d99dcbe553ef4805a8ee25a44ffc084df8ba"
99
}
1010
}

0 commit comments

Comments
 (0)