NO-ISSUE: rebase-main-4.20.0-0.nightly-2025-06-28-115226_amd64-2025-06-28_arm64-2025-06-30 (#5122)

* update last_rebase.sh

* update changelog

* update microshift/go.mod

* update microshift/deps

* update deps gofmt

* update etcd/go.mod

* update etcd/vendor

* update component images

* update manifests

* update buildfiles

---------

Co-authored-by: ci-robot <[email protected]>

Author: microshift-rebase-script[bot]

Makefile.kube_git.var

@@ -1,5 +1,5 @@
 KUBE_GIT_MAJOR=1
 KUBE_GIT_MINOR=32
 KUBE_GIT_VERSION=v1.32.5
-KUBE_GIT_COMMIT=d92880b14300b76b867a83ec887e280a5b77b52e
+KUBE_GIT_COMMIT=02b9b7e65987d5aa4559c318725354713838b5a2
 KUBE_GIT_TREE_STATE=clean

Makefile.version.aarch64.var

@@ -1 +1 @@
-OCP_VERSION := 4.20.0-0.nightly-arm64-2025-06-26-231650
+OCP_VERSION := 4.20.0-0.nightly-arm64-2025-06-30-210738

Makefile.version.x86_64.var

@@ -1 +1 @@
-OCP_VERSION := 4.20.0-0.nightly-2025-06-20-214016
+OCP_VERSION := 4.20.0-0.nightly-2025-06-28-115226

assets/components/csi-snapshot-controller/csi_controller_deployment.yaml

@@ -23,6 +23,8 @@ spec:
         openshift.io/required-scc: restricted-v2
       labels:
         app: csi-snapshot-controller
+        openshift.storage.network-policy.dns: allow
+        openshift.storage.network-policy.api-server: allow
     spec:
       securityContext:
         runAsNonRoot: true

assets/components/multus/kustomization.x86_64.yaml

@@ -2,7 +2,7 @@
 images:
   - name: multus-cni-microshift
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:3d9f7262c02f2397a56b9f83de5565342563173aab799204c9d240c99ba851fa
+    digest: sha256:d4221a4a53fafbe04c7d46556f4f72c485407d814f18b5cf7b14410403c05761
   - name: containernetworking-plugins-microshift
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:32c69f5819b3ec0bdc9e6296aebb64c26d8845943857f1c44095379de92969c3
+    digest: sha256:467ffccb5a3b4511b80f18f7097a5a9e9bb6362f97697be585a0211f191ef3e9

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

@@ -1,6 +1,6 @@
 {
   "release": {
-    "base": "4.20.0-0.nightly-arm64-2025-06-26-231650"
+    "base": "4.20.0-0.nightly-arm64-2025-06-30-210738"
   },
   "images": {
     "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dff6b68a409a3e5cdd679d7a26420abd5ecd75027edd17bb2dbcbab489506530",

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

@@ -1,9 +1,9 @@
 {
   "release": {
-    "base": "4.20.0-0.nightly-2025-06-20-214016"
+    "base": "4.20.0-0.nightly-2025-06-28-115226"
   },
   "images": {
-    "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3d9f7262c02f2397a56b9f83de5565342563173aab799204c9d240c99ba851fa",
-    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:32c69f5819b3ec0bdc9e6296aebb64c26d8845943857f1c44095379de92969c3"
+    "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d4221a4a53fafbe04c7d46556f4f72c485407d814f18b5cf7b14410403c05761",
+    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:467ffccb5a3b4511b80f18f7097a5a9e9bb6362f97697be585a0211f191ef3e9"
   }
 }

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

@@ -2,4 +2,4 @@
 images:
   - name: kube-proxy
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:e73c2485b0b50c8dccaedea2311aad6ee3036377d8ae8047a26bc2a2f4b6c549
+    digest: sha256:3a6a8daae223fc315f73045d733fbc0f5c4f4a2cd5ec1cd87b5fada17fec89b3

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

@@ -1,6 +1,6 @@
 {
   "release": {
-    "base": "4.20.0-0.nightly-arm64-2025-06-26-231650"
+    "base": "4.20.0-0.nightly-arm64-2025-06-30-210738"
   },
   "images": {
     "kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:eb3a68321a7e1c65789da0b389a455dd3efd2eb5680953e4dc7bdc06d4b4446c"

assets/optional/kube-proxy/release-kube-proxy-x86_64.json

@@ -1,8 +1,8 @@
 {
   "release": {
-    "base": "4.20.0-0.nightly-2025-06-20-214016"
+    "base": "4.20.0-0.nightly-2025-06-28-115226"
   },
   "images": {
-    "kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e73c2485b0b50c8dccaedea2311aad6ee3036377d8ae8047a26bc2a2f4b6c549"
+    "kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3a6a8daae223fc315f73045d733fbc0f5c4f4a2cd5ec1cd87b5fada17fec89b3"
   }
 }