Skip to content

Commit 0d0943b

Browse files
microshift-rebase-script[bot]ci-robot
microshift-rebase-script[bot]
and
ci-robot
authored
NO-ISSUE: rebase-release-4.21-4.21.0-0.nightly-2026-01-13-111112_amd64-2026-01-13_arm64-2026-01-13 (#6076)
* update last_rebase.sh * update changelog * update component images * update manifests * update buildfiles * Update SR-IOV for MicroShift --------- Co-authored-by: ci-robot <[email protected]>
1 parent e5ff0a8 commit 0d0943b

20 files changed

Lines changed: 91 additions & 85 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.21.0-0.nightly-arm64-2026-01-12-035834
1+
OCP_VERSION := 4.21.0-0.nightly-arm64-2026-01-13-231012

‎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.21.0-0.nightly-2026-01-08-052422
1+
OCP_VERSION := 4.21.0-0.nightly-2026-01-13-111112

‎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:89667da77c3be3d4e6487ee1e928d16add7bfdca00e05857af442692af2d0b27
5+
digest: sha256:fda943583386015c65a7f2d2db89119669b84f34e46805779b5beca6d8fcd7ef
66
- name: containernetworking-plugins-microshift
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:e94a0ae6348298a9e9a1616a3c478877f2cd2720ff4898130d634aa00d2a81d2
8+
digest: sha256:62b45538a25b2df4de2e7219a0f861df818ce9aa44f9d8856cffe7ff08957186

‎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:546fd5cc3581e45a8641330af196314c66a5854162c6998ec8795b8f640b7dd7
5+
digest: sha256:90c8a272fc48b318968d2802d0a153357dc1bfecbdcd9a8e8676644f576e7d41
66
- name: containernetworking-plugins-microshift
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:d1897a5207c2a837ddd1d5e89c7e9ed7e2ac1fd9062dd0bcab8a0951f11aa7f2
8+
digest: sha256:4f69600b9b2b1192ae08f08adbb52b711a70c821122893663a9319d1608d2f5c

‎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.21.0-0.nightly-arm64-2026-01-12-035834"
3+
"base": "4.21.0-0.nightly-arm64-2026-01-13-231012"
44
},
55
"images": {
6-
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:89667da77c3be3d4e6487ee1e928d16add7bfdca00e05857af442692af2d0b27",
7-
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e94a0ae6348298a9e9a1616a3c478877f2cd2720ff4898130d634aa00d2a81d2"
6+
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fda943583386015c65a7f2d2db89119669b84f34e46805779b5beca6d8fcd7ef",
7+
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:62b45538a25b2df4de2e7219a0f861df818ce9aa44f9d8856cffe7ff08957186"
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.21.0-0.nightly-2026-01-08-052422"
3+
"base": "4.21.0-0.nightly-2026-01-13-111112"
44
},
55
"images": {
6-
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:546fd5cc3581e45a8641330af196314c66a5854162c6998ec8795b8f640b7dd7",
7-
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d1897a5207c2a837ddd1d5e89c7e9ed7e2ac1fd9062dd0bcab8a0951f11aa7f2"
6+
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:90c8a272fc48b318968d2802d0a153357dc1bfecbdcd9a8e8676644f576e7d41",
7+
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4f69600b9b2b1192ae08f08adbb52b711a70c821122893663a9319d1608d2f5c"
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:d3d3c622147aa456723034c63e1fd60eb0c38e195827a99e374b0540d2a44da4
5+
digest: sha256:fd3872651b964f010ba312afda3ec76bce5e0ec55963665b22bba2578635e1b9
66
- name: quay.io/operator-framework/configmap-operator-registry
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:86e876f339c0d937011fa8a572a7f11f6b7cd43489f7b0bce150e4b8bbb5e8d9
8+
digest: sha256:a48e56b57bc3fd34d15b6ce984dab888eb090ccdacd0722c4514a573a034c0e1
99
- name: quay.io/openshift/origin-kube-rbac-proxy
1010
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
11-
digest: sha256:1721f4710643cc4978d8a68f95c94c0ceaf3c1de7426e4500a7527892fefcd20
11+
digest: sha256:98b0ee05778623730ccced3ee46c404feb96885043facf6d8585d2bdcbeb7897
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:86e876f339c0d937011fa8a572a7f11f6b7cd43489f7b0bce150e4b8bbb5e8d9
19+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a48e56b57bc3fd34d15b6ce984dab888eb090ccdacd0722c4514a573a034c0e1
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:d3d3c622147aa456723034c63e1fd60eb0c38e195827a99e374b0540d2a44da4
24+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fd3872651b964f010ba312afda3ec76bce5e0ec55963665b22bba2578635e1b9
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:1ef0a62a5483a22bf4a9a75bb96cb580380dc234667077036d5432973f2a0ebc
5+
digest: sha256:491793e0e77a5197bcdb60d36f4a76e99bc65d2dc59cdf175deddb9f5393afda
66
- name: quay.io/operator-framework/configmap-operator-registry
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:2d4455c31c7a3b6757c2d798d48311839d211f8cb54bfbb723ca25e76c429a5a
8+
digest: sha256:591fa7214d345f111cd43bd4e6e8ec2d29551c926dd39070d909b792d7326898
99
- name: quay.io/openshift/origin-kube-rbac-proxy
1010
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
11-
digest: sha256:26f0f122a0c59c1e0f41296b0c4e43ec648e14aa859468c549d58bc69f95660d
11+
digest: sha256:af5b3de12122f266ee26b6f2281e6527b4a6b43f76a4e1b0570e9a68c3b1df9a
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:2d4455c31c7a3b6757c2d798d48311839d211f8cb54bfbb723ca25e76c429a5a
19+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:591fa7214d345f111cd43bd4e6e8ec2d29551c926dd39070d909b792d7326898
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:1ef0a62a5483a22bf4a9a75bb96cb580380dc234667077036d5432973f2a0ebc
24+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:491793e0e77a5197bcdb60d36f4a76e99bc65d2dc59cdf175deddb9f5393afda
2525
target:
2626
kind: Deployment
2727
labelSelector: app=catalog-operator

‎assets/optional/operator-lifecycle-manager/release-olm-aarch64.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"release": {
3-
"base": "4.21.0-0.nightly-arm64-2026-01-12-035834"
3+
"base": "4.21.0-0.nightly-arm64-2026-01-13-231012"
44
},
55
"images": {
6-
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d3d3c622147aa456723034c63e1fd60eb0c38e195827a99e374b0540d2a44da4",
7-
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:86e876f339c0d937011fa8a572a7f11f6b7cd43489f7b0bce150e4b8bbb5e8d9",
8-
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1721f4710643cc4978d8a68f95c94c0ceaf3c1de7426e4500a7527892fefcd20"
6+
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fd3872651b964f010ba312afda3ec76bce5e0ec55963665b22bba2578635e1b9",
7+
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a48e56b57bc3fd34d15b6ce984dab888eb090ccdacd0722c4514a573a034c0e1",
8+
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:98b0ee05778623730ccced3ee46c404feb96885043facf6d8585d2bdcbeb7897"
99
}
1010
}

‎assets/optional/operator-lifecycle-manager/release-olm-x86_64.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"release": {
3-
"base": "4.21.0-0.nightly-2026-01-08-052422"
3+
"base": "4.21.0-0.nightly-2026-01-13-111112"
44
},
55
"images": {
6-
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1ef0a62a5483a22bf4a9a75bb96cb580380dc234667077036d5432973f2a0ebc",
7-
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2d4455c31c7a3b6757c2d798d48311839d211f8cb54bfbb723ca25e76c429a5a",
8-
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:26f0f122a0c59c1e0f41296b0c4e43ec648e14aa859468c549d58bc69f95660d"
6+
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:491793e0e77a5197bcdb60d36f4a76e99bc65d2dc59cdf175deddb9f5393afda",
7+
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:591fa7214d345f111cd43bd4e6e8ec2d29551c926dd39070d909b792d7326898",
8+
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:af5b3de12122f266ee26b6f2281e6527b4a6b43f76a4e1b0570e9a68c3b1df9a"
99
}
1010
}

0 commit comments

Comments
 (0)