Skip to content

Commit 774f47d

Browse files
microshift-rebase-script[bot]ci-robot
microshift-rebase-script[bot]
and
ci-robot
authored
NO-ISSUE: rebase-main-4.20.0-0.nightly-2025-07-30-185737_amd64-2025-07-30_arm64-2025-07-30 (#5272)
* update last_rebase.sh * update changelog * update microshift/go.mod * update microshift/deps * update microshift/vendor * update deps gofmt * update component images * update manifests * update buildfiles --------- Co-authored-by: ci-robot <[email protected]>
1 parent 84395a2 commit 774f47d

29 files changed

+1606
-1935
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=b94367cabf3edea99cfd7ecf7e8bafdc908d83ca
4+
KUBE_GIT_COMMIT=c42ba29ac01d4ee90cae6a6e3e0b5baefec0f862
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-29-160031
1+
OCP_VERSION := 4.20.0-0.nightly-arm64-2025-07-30-185735

‎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-29-103553
1+
OCP_VERSION := 4.20.0-0.nightly-2025-07-30-185737

‎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:15d2d5ca16f9957ca49e57fde1ad58642d396cfeb1979a79b4b0f806916dc02d
5+
digest: sha256:583c49ec9121482395edfbaf5b77d33db70c6ea71ddbd3f01c2e2b0b09f14f70
66
- name: containernetworking-plugins-microshift
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:2f5c112ae29e876711b05348a450a20b3653d0996361cf9e8672b3a1acd194e6
8+
digest: sha256:23f235f453c837b02aa0a3042844a2dab42eb0712ceeadb18ae4fe0d1cdcf3ec

‎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:679d89634d5460078f42f7b5ec1d1faf36212d731fcc0f8ef7cf0e4182f15dd5
5+
digest: sha256:5a64d2b1a142fc6af09a42314b596edd4134742b92fea7499f1cc0db31143423
66
- name: containernetworking-plugins-microshift
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:876ed22c4ea0a972e1419bb431eec671a08e997c923e88b27f5c795737eacc82
8+
digest: sha256:b2970007f884f13b5b22a93050f09440a057fd6d290af4eb9e67dff0c70d95c4

‎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.20.0-0.nightly-arm64-2025-07-29-160031"
3+
"base": "4.20.0-0.nightly-arm64-2025-07-30-185735"
44
},
55
"images": {
6-
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:15d2d5ca16f9957ca49e57fde1ad58642d396cfeb1979a79b4b0f806916dc02d",
7-
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2f5c112ae29e876711b05348a450a20b3653d0996361cf9e8672b3a1acd194e6"
6+
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:583c49ec9121482395edfbaf5b77d33db70c6ea71ddbd3f01c2e2b0b09f14f70",
7+
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:23f235f453c837b02aa0a3042844a2dab42eb0712ceeadb18ae4fe0d1cdcf3ec"
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.20.0-0.nightly-2025-07-29-103553"
3+
"base": "4.20.0-0.nightly-2025-07-30-185737"
44
},
55
"images": {
6-
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:679d89634d5460078f42f7b5ec1d1faf36212d731fcc0f8ef7cf0e4182f15dd5",
7-
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:876ed22c4ea0a972e1419bb431eec671a08e997c923e88b27f5c795737eacc82"
6+
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5a64d2b1a142fc6af09a42314b596edd4134742b92fea7499f1cc0db31143423",
7+
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b2970007f884f13b5b22a93050f09440a057fd6d290af4eb9e67dff0c70d95c4"
88
}
99
}

‎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:48ec8f93baa7715ec1b15a06704c99a17101274b2ca290c78ba034404b2c24a5
5+
digest: sha256:2118f85002f6c4c8b17877610e8ea5b794e53da8a43cb9c07071d076dbe35477

‎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:20911c38cbddd02ac8cbd0321fea3f63b901187fc5f3f3a4b52b1dd3554becba
5+
digest: sha256:f0e3747aae781d6b274aa2f0e4254bd23edb62fa86d0c282b1361478d7e28f9a

‎assets/optional/kube-proxy/release-kube-proxy-aarch64.json

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-29-160031"
3+
"base": "4.20.0-0.nightly-arm64-2025-07-30-185735"
44
},
55
"images": {
6-
"kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:48ec8f93baa7715ec1b15a06704c99a17101274b2ca290c78ba034404b2c24a5"
6+
"kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2118f85002f6c4c8b17877610e8ea5b794e53da8a43cb9c07071d076dbe35477"
77
}
88
}

0 commit comments

Comments
 (0)