Skip to content

Commit 9264bfd

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #6520 from pacevedom/rebase-bbad4d6f8-5.0.0-0.nightly-2026-04-16-172425_amd64-2026-04-16_arm64-2026-04-16
NO-ISSUE: rebase-main-nightly_amd64-2026-04-16-172425_arm64-2026-04-16-232425
2 parents fe29d2a + 5db15d4 commit 9264bfd

File tree

53 files changed

+604
-172
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+604
-172
lines changed

‎Makefile.version.aarch64.var‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
OCP_VERSION := 4.22.0-0.nightly-arm64-2026-04-02-213117
1+
OCP_VERSION := 5.0.0-0.nightly-arm64-2026-04-16-232425

‎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.22.0-0.nightly-2026-04-01-223038
1+
OCP_VERSION := 5.0.0-0.nightly-2026-04-16-172425

‎assets/components/multus/kustomization.aarch64.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11

22
images:
33
- name: multus-cni-microshift
4-
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
5-
digest: sha256:bfb904a68e228e2fc306f4b69646c3a733cff4c10e6fda7fe75df3174c818ae2
4+
newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
5+
digest: sha256:eb6b8347d088bebcf85a1cec86d78330fbd99dbdfef75cdaba2a5f28d9323a5d
66
- name: containernetworking-plugins-microshift
7-
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:6ad7f1c820b2b007971c60cdcf85dff0f20bc2f2b3c8b1fe5226522322b2792d
7+
newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
8+
digest: sha256:464cca590482118bb8263385816d870b3143215b66ef4a109138f9e665f73da0

‎assets/components/multus/kustomization.x86_64.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11

22
images:
33
- name: multus-cni-microshift
4-
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
5-
digest: sha256:6fc2898a173a8a6831fcf079c9b8afb66851d2fc066ada6285e9fdb176f5d1fe
4+
newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
5+
digest: sha256:ee8059698e26e4376215c0df71ed72e548e7334be4061272bd3ca6087533cb6c
66
- name: containernetworking-plugins-microshift
7-
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:6650ccac2f542d305f2dbf1c607da0b4b514f08a6f80b787b11c0d7659195e74
7+
newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
8+
digest: sha256:10729eece790c49f196e44ad121dd632f6a5722b3c0a4c49c76e151983c1f71d

‎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.22.0-0.nightly-arm64-2026-04-02-213117"
3+
"base": "5.0.0-0.nightly-arm64-2026-04-16-232425"
44
},
55
"images": {
6-
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bfb904a68e228e2fc306f4b69646c3a733cff4c10e6fda7fe75df3174c818ae2",
7-
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6ad7f1c820b2b007971c60cdcf85dff0f20bc2f2b3c8b1fe5226522322b2792d"
6+
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:eb6b8347d088bebcf85a1cec86d78330fbd99dbdfef75cdaba2a5f28d9323a5d",
7+
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:464cca590482118bb8263385816d870b3143215b66ef4a109138f9e665f73da0"
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.22.0-0.nightly-2026-04-01-223038"
3+
"base": "5.0.0-0.nightly-2026-04-16-172425"
44
},
55
"images": {
6-
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6fc2898a173a8a6831fcf079c9b8afb66851d2fc066ada6285e9fdb176f5d1fe",
7-
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6650ccac2f542d305f2dbf1c607da0b4b514f08a6f80b787b11c0d7659195e74"
6+
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:ee8059698e26e4376215c0df71ed72e548e7334be4061272bd3ca6087533cb6c",
7+
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:10729eece790c49f196e44ad121dd632f6a5722b3c0a4c49c76e151983c1f71d"
88
}
99
}

‎assets/components/service-ca/clusterrole.yaml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,3 +78,19 @@ rules:
7878
- get
7979
- list
8080
- watch
81+
- apiGroups:
82+
- config.openshift.io
83+
resources:
84+
- featuregates
85+
verbs:
86+
- get
87+
- list
88+
- watch
89+
- apiGroups:
90+
- config.openshift.io
91+
resources:
92+
- pkis
93+
verbs:
94+
- get
95+
- list
96+
- watch

‎assets/components/service-ca/deployment.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ spec:
3737
requests:
3838
memory: 120Mi
3939
cpu: 10m
40+
env:
41+
- name: OPERATOR_IMAGE_VERSION
4042
terminationMessagePolicy: FallbackToLogsOnError
4143
volumeMounts:
4244
- mountPath: /var/run/secrets/signing-key

‎assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11

22
images:
33
- name: quay.io/operator-framework/olm
4-
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
5-
digest: sha256:ff87b8ca01872de4f6fddf890f0e7a243b179376f200567300b1c2c1918e5402
4+
newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
5+
digest: sha256:4a1ea3c63005636dbb62b68219c1059bccd2c6b60d59074dbf3356da7f0376b5
66
- name: quay.io/operator-framework/configmap-operator-registry
7-
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:00f42ea149e7b5ab62b08da79da65bcd7e0785442bd5ee0314b924fbeb0df975
7+
newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
8+
digest: sha256:5c51341a1d1721b79d168547f301260d7c907f24268a9677f40c2dc4b759abba
99
- name: quay.io/openshift/origin-kube-rbac-proxy
10-
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
11-
digest: sha256:b2a0c592a6105fcba0299bcebf9c6079015f533bc2ebb8791e7953b26861c788
10+
newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
11+
digest: sha256:d4cb8ac0d9bd423f6f21c4746492568dae7514c7f4a6a38c02a400bc84a330d1
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:00f42ea149e7b5ab62b08da79da65bcd7e0785442bd5ee0314b924fbeb0df975
19+
value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:5c51341a1d1721b79d168547f301260d7c907f24268a9677f40c2dc4b759abba
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:ff87b8ca01872de4f6fddf890f0e7a243b179376f200567300b1c2c1918e5402
24+
value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:4a1ea3c63005636dbb62b68219c1059bccd2c6b60d59074dbf3356da7f0376b5
2525
target:
2626
kind: Deployment
2727
labelSelector: app=catalog-operator

‎assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11

22
images:
33
- name: quay.io/operator-framework/olm
4-
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
5-
digest: sha256:d0356b881554c2579ab4eabcd2433c0ec548df35766f03f0d03a87204742b8d2
4+
newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
5+
digest: sha256:3486df8d22a1d6da876f336fb0834b5b821d6755a74326902d441b694952412b
66
- name: quay.io/operator-framework/configmap-operator-registry
7-
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:fdf853cfa6b7b84c9b009bb3b81e4a896e97df95d9ea3657d0851a855311b2d8
7+
newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
8+
digest: sha256:697a6935830840e75e281f717c0a6d201fa2e8a4c1dbeaff2dfb2ea0ef7a5522
99
- name: quay.io/openshift/origin-kube-rbac-proxy
10-
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
11-
digest: sha256:57a72fc145d1d8c46ea65ed851c48c96c3b3b3e7775a7ddddb1f7463ba4a3743
10+
newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
11+
digest: sha256:99226d69076922896e9ff9e8e46542baa477bf833d90775140f3128b18ce9e5b
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:fdf853cfa6b7b84c9b009bb3b81e4a896e97df95d9ea3657d0851a855311b2d8
19+
value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:697a6935830840e75e281f717c0a6d201fa2e8a4c1dbeaff2dfb2ea0ef7a5522
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:d0356b881554c2579ab4eabcd2433c0ec548df35766f03f0d03a87204742b8d2
24+
value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:3486df8d22a1d6da876f336fb0834b5b821d6755a74326902d441b694952412b
2525
target:
2626
kind: Deployment
2727
labelSelector: app=catalog-operator

0 commit comments

Comments
 (0)