Skip to content

Commit 06d3a6f

Browse files
microshift-rebase-script[bot]ci-robot
andauthored
NO-ISSUE: rebase-release-4.22-4.22.0-0.nightly-2026-04-15-103903_amd64-2026-04-15_arm64-2026-04-15 (#6512)
* update last_rebase.sh * update changelog * update component images * update manifests * update buildfiles * Update SR-IOV for MicroShift --------- Co-authored-by: ci-robot <ci-robot@openshift.io>
1 parent 5480567 commit 06d3a6f

21 files changed

Lines changed: 96 additions & 424 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.22.0-0.nightly-arm64-2026-04-14-203621
1+
OCP_VERSION := 4.22.0-0.nightly-arm64-2026-04-15-223903

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-13-230307
1+
OCP_VERSION := 4.22.0-0.nightly-2026-04-15-103903

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:79748c8259000b32e8f82b103828b71ed48d74d39330e2eab329077bc3f82cff
5+
digest: sha256:0b5dea1a4af066d607b01598dfd50e061d9c2e3d65f8c30c1bd3abb056b33152
66
- name: containernetworking-plugins-microshift
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:bdcf837fe2e2b9529ee3cee750145488051fc5ad2cebefc5d51b406ed5f4cc77
8+
digest: sha256:7f98a17046285206148ae015ffce72d4211d49f0975d8f20e674704ce36c13d0

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:712fd08a3c828c01ecb632571dc9e913b1bda61f37b5329316fa89e1f87a825a
5+
digest: sha256:4b762730e99c7d83a0273c44c6118ef94e67f4c89d5f70d1576b90efcedb99d5
66
- name: containernetworking-plugins-microshift
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:15e1f5a24bcc2076670044313ca7a070fd9444b69a6620fdd973e09899c54b97
8+
digest: sha256:5dd21ef2e0393f87b3104c55c362594a983050054ec2c1b720e1687241bdcd8e
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-14-203621"
3+
"base": "4.22.0-0.nightly-arm64-2026-04-15-223903"
44
},
55
"images": {
6-
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:79748c8259000b32e8f82b103828b71ed48d74d39330e2eab329077bc3f82cff",
7-
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bdcf837fe2e2b9529ee3cee750145488051fc5ad2cebefc5d51b406ed5f4cc77"
6+
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0b5dea1a4af066d607b01598dfd50e061d9c2e3d65f8c30c1bd3abb056b33152",
7+
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7f98a17046285206148ae015ffce72d4211d49f0975d8f20e674704ce36c13d0"
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.22.0-0.nightly-2026-04-13-230307"
3+
"base": "4.22.0-0.nightly-2026-04-15-103903"
44
},
55
"images": {
6-
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:712fd08a3c828c01ecb632571dc9e913b1bda61f37b5329316fa89e1f87a825a",
7-
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:15e1f5a24bcc2076670044313ca7a070fd9444b69a6620fdd973e09899c54b97"
6+
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4b762730e99c7d83a0273c44c6118ef94e67f4c89d5f70d1576b90efcedb99d5",
7+
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5dd21ef2e0393f87b3104c55c362594a983050054ec2c1b720e1687241bdcd8e"
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:0125f3238c716b8addd4d1fdf286a132d4acbfe5010af910d6cc9ddb9db62087
5+
digest: sha256:3ffe14ab720dcf34fdb9bdcfab9e0c7819ed10de29235aa2a3d42de4ed83ba0f
66
- name: quay.io/operator-framework/configmap-operator-registry
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:b3163380a3ad20b5d2f38f35e8bb4b9624f142c12668d130f53e6064f5aeb3aa
8+
digest: sha256:d296a427e6b59d8c535705b6b1dfa857517639c3a38e9b44680d0069c2c2aae8
99
- name: quay.io/openshift/origin-kube-rbac-proxy
1010
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
11-
digest: sha256:69e1e32294ee29fbc18a09dbb8d10e428edaf50865b53173dadf1b8984443e2f
11+
digest: sha256:1212a6316a0a1fd59123abbc120817a05c8686b7d5caf7db9d0f48ba1530a0fe
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:b3163380a3ad20b5d2f38f35e8bb4b9624f142c12668d130f53e6064f5aeb3aa
19+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d296a427e6b59d8c535705b6b1dfa857517639c3a38e9b44680d0069c2c2aae8
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:0125f3238c716b8addd4d1fdf286a132d4acbfe5010af910d6cc9ddb9db62087
24+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3ffe14ab720dcf34fdb9bdcfab9e0c7819ed10de29235aa2a3d42de4ed83ba0f
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:ddedf7e778358fdfc771ae2ca5e658383f07de577f01465d8af5e66a58d0df3f
5+
digest: sha256:3f4c190537315422300c119422f9207f9b1cb1ef03e8ebd0a3560cf976b2ae4e
66
- name: quay.io/operator-framework/configmap-operator-registry
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:0f47577365fc6ff05db22fc69662f14b4e7fe16540c25998e9cd359760118a62
8+
digest: sha256:861932c526e81499a8be1eabf6d26d9fe713585a8abb3ef7916dfe3c346d431c
99
- name: quay.io/openshift/origin-kube-rbac-proxy
1010
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
11-
digest: sha256:be383d1ad63fa266bac6c6ca44c1b0b85db60a5cb66602c97011fe3771fcf76a
11+
digest: sha256:b6612c92cb172a3e929daab852ff8820e0d69b8bf41db9f2e5fc0b6f79b062c1
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:0f47577365fc6ff05db22fc69662f14b4e7fe16540c25998e9cd359760118a62
19+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:861932c526e81499a8be1eabf6d26d9fe713585a8abb3ef7916dfe3c346d431c
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:ddedf7e778358fdfc771ae2ca5e658383f07de577f01465d8af5e66a58d0df3f
24+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3f4c190537315422300c119422f9207f9b1cb1ef03e8ebd0a3560cf976b2ae4e
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.22.0-0.nightly-arm64-2026-04-14-203621"
3+
"base": "4.22.0-0.nightly-arm64-2026-04-15-223903"
44
},
55
"images": {
6-
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0125f3238c716b8addd4d1fdf286a132d4acbfe5010af910d6cc9ddb9db62087",
7-
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b3163380a3ad20b5d2f38f35e8bb4b9624f142c12668d130f53e6064f5aeb3aa",
8-
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:69e1e32294ee29fbc18a09dbb8d10e428edaf50865b53173dadf1b8984443e2f"
6+
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3ffe14ab720dcf34fdb9bdcfab9e0c7819ed10de29235aa2a3d42de4ed83ba0f",
7+
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d296a427e6b59d8c535705b6b1dfa857517639c3a38e9b44680d0069c2c2aae8",
8+
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1212a6316a0a1fd59123abbc120817a05c8686b7d5caf7db9d0f48ba1530a0fe"
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.22.0-0.nightly-2026-04-13-230307"
3+
"base": "4.22.0-0.nightly-2026-04-15-103903"
44
},
55
"images": {
6-
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ddedf7e778358fdfc771ae2ca5e658383f07de577f01465d8af5e66a58d0df3f",
7-
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0f47577365fc6ff05db22fc69662f14b4e7fe16540c25998e9cd359760118a62",
8-
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:be383d1ad63fa266bac6c6ca44c1b0b85db60a5cb66602c97011fe3771fcf76a"
6+
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3f4c190537315422300c119422f9207f9b1cb1ef03e8ebd0a3560cf976b2ae4e",
7+
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:861932c526e81499a8be1eabf6d26d9fe713585a8abb3ef7916dfe3c346d431c",
8+
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b6612c92cb172a3e929daab852ff8820e0d69b8bf41db9f2e5fc0b6f79b062c1"
99
}
1010
}

0 commit comments

Comments
 (0)