Skip to content

Commit d9d327c

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-2025-12-18-020818_amd64-2025-12-18_arm64-2025-12-18 (#5946)
* update last_rebase.sh * update changelog * update microshift/deps * update component images * update manifests * update buildfiles --------- Co-authored-by: ci-robot <[email protected]>
1 parent 2bd6236 commit d9d327c

File tree

19 files changed

+66
-59
lines changed

19 files changed

+66
-59
lines changed

‎Makefile.kube_git.var‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
KUBE_GIT_MAJOR=1
22
KUBE_GIT_MINOR=34
33
KUBE_GIT_VERSION=v1.34.2
4-
KUBE_GIT_COMMIT=e4b4333a1e73cf80cbc7e4d46d3516aa79c1ef07
4+
KUBE_GIT_COMMIT=52351d68ef76ea7ad374e31ae1afb32e1d132c97
55
KUBE_GIT_TREE_STATE=clean

‎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-2025-12-17-223241
1+
OCP_VERSION := 4.21.0-0.nightly-arm64-2025-12-18-232002

‎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-2025-12-15-125449
1+
OCP_VERSION := 4.21.0-0.nightly-2025-12-18-020818

‎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:18552017da9aa18b031807120befe01faea9c75dda06808a11bf8b58e8c3e3fe
5+
digest: sha256:f8aec9d2b954482c24a141facb8834f22ed7009e9098dca3ab13b4436483b488
66
- name: containernetworking-plugins-microshift
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:7b235df906a1ee6f10a3124bb4aba4f442e1daeec0c2c561e18ab1248ef21059
8+
digest: sha256:c7041673dfe0d6a23864466bbfb458c78525261e586c260cc4db6286abc689da

‎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:339e6c637393961f0ddfaff015fa9030a9abdb75a1d24c20da064793a97cee0b
5+
digest: sha256:438da73f717935c02088a78e1871481cae7c647d04cc568004d4195f424b0798
66
- name: containernetworking-plugins-microshift
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:875caf9302b320c9fd41be71ba0be0aab15765048e6847dd231cee5819d5348a
8+
digest: sha256:cf9f5d223ce47e400388322e0057fadf80a5ca6bb4a04783adfc72ddce79c3cc

‎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-2025-12-17-223241"
3+
"base": "4.21.0-0.nightly-arm64-2025-12-18-232002"
44
},
55
"images": {
6-
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:18552017da9aa18b031807120befe01faea9c75dda06808a11bf8b58e8c3e3fe",
7-
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7b235df906a1ee6f10a3124bb4aba4f442e1daeec0c2c561e18ab1248ef21059"
6+
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f8aec9d2b954482c24a141facb8834f22ed7009e9098dca3ab13b4436483b488",
7+
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c7041673dfe0d6a23864466bbfb458c78525261e586c260cc4db6286abc689da"
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-2025-12-15-125449"
3+
"base": "4.21.0-0.nightly-2025-12-18-020818"
44
},
55
"images": {
6-
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:339e6c637393961f0ddfaff015fa9030a9abdb75a1d24c20da064793a97cee0b",
7-
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:875caf9302b320c9fd41be71ba0be0aab15765048e6847dd231cee5819d5348a"
6+
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:438da73f717935c02088a78e1871481cae7c647d04cc568004d4195f424b0798",
7+
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cf9f5d223ce47e400388322e0057fadf80a5ca6bb4a04783adfc72ddce79c3cc"
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:31eece9e8eab776daf32ba43e9f87c39a6e57d6b487c224d0330f0fd3113a69e
5+
digest: sha256:6156556aec46b07552c6b57c6087ea3f0937f1d37da7b39aad58a3a0f9bd0bd9
66
- name: quay.io/operator-framework/configmap-operator-registry
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:c52641e6b34b070d139734824fa386a1925958b125949aa77b1738dc11f1f26b
8+
digest: sha256:e789f2ebe4d5b8f4e5b758cdd9094767df56be35ddbd67cb55a259e2afd0bea3
99
- name: quay.io/openshift/origin-kube-rbac-proxy
1010
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
11-
digest: sha256:dd585eb01f7424740fb0c3d1fbcbc1a6cf04fc25ba49ddc8f997701bf741d186
11+
digest: sha256:b069959da7414566a1f8b90b284aeda758ce7fbd1b35bbf04e6f5d9f3aa9d7f1
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:c52641e6b34b070d139734824fa386a1925958b125949aa77b1738dc11f1f26b
19+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e789f2ebe4d5b8f4e5b758cdd9094767df56be35ddbd67cb55a259e2afd0bea3
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:31eece9e8eab776daf32ba43e9f87c39a6e57d6b487c224d0330f0fd3113a69e
24+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6156556aec46b07552c6b57c6087ea3f0937f1d37da7b39aad58a3a0f9bd0bd9
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:4cba3ea5043689480a4cc2517efa8e8469fcb5c082c7d46644b997849c9b1682
5+
digest: sha256:b5f8fab0a7b7bb1164fac620eb1f305e6fd7b4b7b8ff88d7842a3dc4791207eb
66
- name: quay.io/operator-framework/configmap-operator-registry
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:2bf1719296b50c43547f51f1c574d478f079222f8d39dc7290ce13b72d05dd27
8+
digest: sha256:b9e469c76e065f7faee0b4367afd6c54c88e0bca0c4c4af53cb69ffc38404089
99
- name: quay.io/openshift/origin-kube-rbac-proxy
1010
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
11-
digest: sha256:98fe564dafca4b43415e55fcc377fca43d45e0774403b7566c8e480ca0d37ab3
11+
digest: sha256:bc35412651f9528a5a73e40adaa6bb41e02f5c6a333e1c569f6e9ec13c99b160
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:2bf1719296b50c43547f51f1c574d478f079222f8d39dc7290ce13b72d05dd27
19+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b9e469c76e065f7faee0b4367afd6c54c88e0bca0c4c4af53cb69ffc38404089
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:4cba3ea5043689480a4cc2517efa8e8469fcb5c082c7d46644b997849c9b1682
24+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b5f8fab0a7b7bb1164fac620eb1f305e6fd7b4b7b8ff88d7842a3dc4791207eb
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-2025-12-17-223241"
3+
"base": "4.21.0-0.nightly-arm64-2025-12-18-232002"
44
},
55
"images": {
6-
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:31eece9e8eab776daf32ba43e9f87c39a6e57d6b487c224d0330f0fd3113a69e",
7-
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c52641e6b34b070d139734824fa386a1925958b125949aa77b1738dc11f1f26b",
8-
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dd585eb01f7424740fb0c3d1fbcbc1a6cf04fc25ba49ddc8f997701bf741d186"
6+
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6156556aec46b07552c6b57c6087ea3f0937f1d37da7b39aad58a3a0f9bd0bd9",
7+
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e789f2ebe4d5b8f4e5b758cdd9094767df56be35ddbd67cb55a259e2afd0bea3",
8+
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b069959da7414566a1f8b90b284aeda758ce7fbd1b35bbf04e6f5d9f3aa9d7f1"
99
}
1010
}

0 commit comments

Comments
 (0)