Skip to content

Commit 2074990

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-04-08-161819_amd64-2026-04-08_arm64-2026-04-08 (#6481)
* update last_rebase.sh * update changelog * update microshift/go.mod * update microshift/deps * update microshift/vendor * update etcd/go.mod * update etcd/vendor * update component images * update manifests * update buildfiles * update last_rebase_cert_manager.sh --------- Co-authored-by: ci-robot <ci-robot@openshift.io>
1 parent 33984ed commit 2074990

32 files changed

Lines changed: 382 additions & 250 deletions

File tree

‎Makefile.kube_git.var‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
KUBE_GIT_MAJOR=1
22
KUBE_GIT_MINOR=34
3-
KUBE_GIT_VERSION=v1.34.5
4-
KUBE_GIT_COMMIT=8b1d67b459cd554cd4b6d878e9bf4d425b3bf9a0
3+
KUBE_GIT_VERSION=v1.34.6
4+
KUBE_GIT_COMMIT=dfffacdf0ad6e9aa75664c7b3167dd2ddbfc17ba
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-2026-04-02-004201
1+
OCP_VERSION := 4.21.0-0.nightly-arm64-2026-04-08-221819

‎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-03-29-021947
1+
OCP_VERSION := 4.21.0-0.nightly-2026-04-08-161819

‎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:c4f53cff5273db4b6de7bfc440bf02e918297c75a9914248d9d782fcf09d10af
5+
digest: sha256:7297eac0a0686137bc4f35ce1ce32d4e18d60addf80b5c88937931e308aeac5e
66
- name: containernetworking-plugins-microshift
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:2b785737b81aa6ae14a8cb4ea4bc05bb9fd586eb37a8f607105da0e8606d7dc4
8+
digest: sha256:f5639fa5e31715e424d4b5b9f1138fede381268b32913543ad9e11acb37bbc86

‎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:589c14232f169ebf2c7146f3e979802cc33d8a2ed743a6ddf1a58b5cafa0d894
5+
digest: sha256:9e9521a481b767a9cdcb6fd19a6a141a506d70983143eeb383aaa231ba220d74
66
- name: containernetworking-plugins-microshift
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:8ad560d2244ef733306c69a4393321132a8af05001233043df16befc78b35527
8+
digest: sha256:ceb62751b04e70c7be05d528b59810ba76677b78676e1d23361ac6c2722d40a0

‎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-04-02-004201"
3+
"base": "4.21.0-0.nightly-arm64-2026-04-08-221819"
44
},
55
"images": {
6-
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c4f53cff5273db4b6de7bfc440bf02e918297c75a9914248d9d782fcf09d10af",
7-
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2b785737b81aa6ae14a8cb4ea4bc05bb9fd586eb37a8f607105da0e8606d7dc4"
6+
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7297eac0a0686137bc4f35ce1ce32d4e18d60addf80b5c88937931e308aeac5e",
7+
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f5639fa5e31715e424d4b5b9f1138fede381268b32913543ad9e11acb37bbc86"
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-03-29-021947"
3+
"base": "4.21.0-0.nightly-2026-04-08-161819"
44
},
55
"images": {
6-
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:589c14232f169ebf2c7146f3e979802cc33d8a2ed743a6ddf1a58b5cafa0d894",
7-
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8ad560d2244ef733306c69a4393321132a8af05001233043df16befc78b35527"
6+
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9e9521a481b767a9cdcb6fd19a6a141a506d70983143eeb383aaa231ba220d74",
7+
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ceb62751b04e70c7be05d528b59810ba76677b78676e1d23361ac6c2722d40a0"
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:5e2c0dcfefda62f26e8d60007495cca494656df8e304b73fa001f6d1969229fc
5+
digest: sha256:397b74d9dbd41ee13fd3086b68cef358753c074749d94d1fb9f601fe74546459
66
- name: quay.io/operator-framework/configmap-operator-registry
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:86b60e41bf75de26427c9af11dd2fbaac21f445f1a32b3118a4dae965ce07800
8+
digest: sha256:bb780f9676c981bab37cf21f50da40f23e64bea0886883228d1783e0fe3922fe
99
- name: quay.io/openshift/origin-kube-rbac-proxy
1010
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
11-
digest: sha256:cc4155e82b744b0f1cf679568bd2ee9c3314e0aeabac25afe720c0cee8b6eecd
11+
digest: sha256:95ef15e7f2a54fe5269412a36a2ee028e2b0276b80b84e534e5497c57cc0b801
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:86b60e41bf75de26427c9af11dd2fbaac21f445f1a32b3118a4dae965ce07800
19+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bb780f9676c981bab37cf21f50da40f23e64bea0886883228d1783e0fe3922fe
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:5e2c0dcfefda62f26e8d60007495cca494656df8e304b73fa001f6d1969229fc
24+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:397b74d9dbd41ee13fd3086b68cef358753c074749d94d1fb9f601fe74546459
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:0d718017af6b66188203fd57a9315113192617a88966bf7168373dd81cb2ca07
5+
digest: sha256:e1d09d3bc462080fc812e2c7d3a2feb17300c468bbb6e1fdffc17a017aee53c7
66
- name: quay.io/operator-framework/configmap-operator-registry
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:1230a34167f5af65a5200d930dc3b5e0dd5ceab7574ff88fd913ec37bb88baf2
8+
digest: sha256:019fda8006d5c7298189cdcab35adeb8926a5ef2240eebaf0db2167b5c8796d8
99
- name: quay.io/openshift/origin-kube-rbac-proxy
1010
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
11-
digest: sha256:9f0c8638757e0a9dd8ab7ef40fa069576482338933327f18062ac7c5f3b6172e
11+
digest: sha256:60d04a021e40cba1901e74fac014755df1376a72c62b15e1d3c7e80097a054cb
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:1230a34167f5af65a5200d930dc3b5e0dd5ceab7574ff88fd913ec37bb88baf2
19+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:019fda8006d5c7298189cdcab35adeb8926a5ef2240eebaf0db2167b5c8796d8
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:0d718017af6b66188203fd57a9315113192617a88966bf7168373dd81cb2ca07
24+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e1d09d3bc462080fc812e2c7d3a2feb17300c468bbb6e1fdffc17a017aee53c7
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-04-02-004201"
3+
"base": "4.21.0-0.nightly-arm64-2026-04-08-221819"
44
},
55
"images": {
6-
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5e2c0dcfefda62f26e8d60007495cca494656df8e304b73fa001f6d1969229fc",
7-
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:86b60e41bf75de26427c9af11dd2fbaac21f445f1a32b3118a4dae965ce07800",
8-
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cc4155e82b744b0f1cf679568bd2ee9c3314e0aeabac25afe720c0cee8b6eecd"
6+
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:397b74d9dbd41ee13fd3086b68cef358753c074749d94d1fb9f601fe74546459",
7+
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bb780f9676c981bab37cf21f50da40f23e64bea0886883228d1783e0fe3922fe",
8+
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:95ef15e7f2a54fe5269412a36a2ee028e2b0276b80b84e534e5497c57cc0b801"
99
}
1010
}

0 commit comments

Comments
 (0)