Skip to content

Commit 32b6cbd

Browse files
microshift-rebase-script[bot]ci-robot
andauthored
NO-ISSUE: rebase-main-4.20.0-0.nightly-2025-07-31-063120_amd64-2025-07-31_arm64-2025-07-31 (#5276)
* update last_rebase.sh * update changelog * update component images * update manifests * update buildfiles --------- Co-authored-by: ci-robot <[email protected]>
1 parent 774f47d commit 32b6cbd

18 files changed

+60
-66
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=33
33
KUBE_GIT_VERSION=v1.33.2
4-
KUBE_GIT_COMMIT=c42ba29ac01d4ee90cae6a6e3e0b5baefec0f862
4+
KUBE_GIT_COMMIT=80b82ba5ae030c3e2b7d7752a204ddf71139842c
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.20.0-0.nightly-arm64-2025-07-30-185735
1+
OCP_VERSION := 4.20.0-0.nightly-arm64-2025-07-31-065735

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.20.0-0.nightly-2025-07-30-185737
1+
OCP_VERSION := 4.20.0-0.nightly-2025-07-31-063120

assets/components/multus/release-multus-aarch64.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"release": {
3-
"base": "4.20.0-0.nightly-arm64-2025-07-30-185735"
3+
"base": "4.20.0-0.nightly-arm64-2025-07-31-065735"
44
},
55
"images": {
66
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:583c49ec9121482395edfbaf5b77d33db70c6ea71ddbd3f01c2e2b0b09f14f70",

assets/components/multus/release-multus-x86_64.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"release": {
3-
"base": "4.20.0-0.nightly-2025-07-30-185737"
3+
"base": "4.20.0-0.nightly-2025-07-31-063120"
44
},
55
"images": {
66
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5a64d2b1a142fc6af09a42314b596edd4134742b92fea7499f1cc0db31143423",

assets/optional/kube-proxy/kustomization.aarch64.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
images:
33
- name: kube-proxy
44
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
5-
digest: sha256:2118f85002f6c4c8b17877610e8ea5b794e53da8a43cb9c07071d076dbe35477
5+
digest: sha256:0023694f380a7d3ac849facadc196d6d553c1e930110f575d166230cca45723f

assets/optional/kube-proxy/kustomization.x86_64.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
images:
33
- name: kube-proxy
44
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
5-
digest: sha256:f0e3747aae781d6b274aa2f0e4254bd23edb62fa86d0c282b1361478d7e28f9a
5+
digest: sha256:c13527c27d15b62e1b1d94fbc122c267fc76f8db1189d71b751a0e67e41e90f5
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"release": {
3-
"base": "4.20.0-0.nightly-arm64-2025-07-30-185735"
3+
"base": "4.20.0-0.nightly-arm64-2025-07-31-065735"
44
},
55
"images": {
6-
"kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2118f85002f6c4c8b17877610e8ea5b794e53da8a43cb9c07071d076dbe35477"
6+
"kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0023694f380a7d3ac849facadc196d6d553c1e930110f575d166230cca45723f"
77
}
88
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"release": {
3-
"base": "4.20.0-0.nightly-2025-07-30-185737"
3+
"base": "4.20.0-0.nightly-2025-07-31-063120"
44
},
55
"images": {
6-
"kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f0e3747aae781d6b274aa2f0e4254bd23edb62fa86d0c282b1361478d7e28f9a"
6+
"kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c13527c27d15b62e1b1d94fbc122c267fc76f8db1189d71b751a0e67e41e90f5"
77
}
88
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"release": {
3-
"base": "4.20.0-0.nightly-arm64-2025-07-30-185735"
3+
"base": "4.20.0-0.nightly-arm64-2025-07-31-065735"
44
},
55
"images": {
66
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ea2cb58510c4a074db617576667879f0dc06738953a58f1f9fa70a552ba392bd",

0 commit comments

Comments
 (0)