NO-ISSUE: rebase-main-4.20.0-0.nightly-2025-06-09-022311_amd64-2025-06-09_arm64-2025-06-10

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=886f7c90e4bd137f91ebfb7d0cb55d476e719643
+KUBE_GIT_COMMIT=e541011ee9752101e2e11bf455ade08da6d1e6fd
 KUBE_GIT_TREE_STATE=clean

Makefile.version.aarch64.var

@@ -1 +1 @@
-OCP_VERSION := 4.20.0-0.nightly-arm64-2025-06-03-221556
+OCP_VERSION := 4.20.0-0.nightly-arm64-2025-06-10-104243

Makefile.version.x86_64.var

@@ -1 +1 @@
-OCP_VERSION := 4.20.0-0.nightly-2025-06-02-175911
+OCP_VERSION := 4.20.0-0.nightly-2025-06-09-022311

assets/components/multus/kustomization.aarch64.yaml

@@ -2,7 +2,7 @@
 images:
   - name: multus-cni-microshift
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:7aaebaefc11480b236dd0a7f497e52da3c1370ee6f540c679153e1c6a1ae7d4c
+    digest: sha256:6f03e38771da37a950ee2ad4ed21d6f1401b792666c11ea12ab6c57ecac18689
   - name: containernetworking-plugins-microshift
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:844c2c27fea94063bbd30bf41bd5751c270160834ac16ca645c30a96e8f968b0
+    digest: sha256:974b29320b123da14da9cfc6d34b82555b356e1ebaacbf4e0d75275a251abf9e

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:f61844aee9697131664b5099ffa43e7726cdc4bf82f0e7859b340d744c83a819
+    digest: sha256:0c29485d61a615c12d233ae04d3da7beb090d8f00921a02ac75cafa5d344e77b
   - name: containernetworking-plugins-microshift
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:5ffc236accd1d6054bb53a794dfc7eee8b7f703d44a01c38b33c699cbde657a1
+    digest: sha256:6fc699747acbc064380536614d62b3e42bfc2ac3193e745eea5dbe2f70e9f7d8

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

@@ -1,9 +1,9 @@
 {
   "release": {
-    "base": "4.20.0-0.nightly-arm64-2025-06-03-221556"
+    "base": "4.20.0-0.nightly-arm64-2025-06-10-104243"
   },
   "images": {
-    "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7aaebaefc11480b236dd0a7f497e52da3c1370ee6f540c679153e1c6a1ae7d4c",
-    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:844c2c27fea94063bbd30bf41bd5751c270160834ac16ca645c30a96e8f968b0"
+    "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6f03e38771da37a950ee2ad4ed21d6f1401b792666c11ea12ab6c57ecac18689",
+    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:974b29320b123da14da9cfc6d34b82555b356e1ebaacbf4e0d75275a251abf9e"
   }
 }

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

@@ -1,9 +1,9 @@
 {
   "release": {
-    "base": "4.20.0-0.nightly-2025-06-02-175911"
+    "base": "4.20.0-0.nightly-2025-06-09-022311"
   },
   "images": {
-    "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f61844aee9697131664b5099ffa43e7726cdc4bf82f0e7859b340d744c83a819",
-    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5ffc236accd1d6054bb53a794dfc7eee8b7f703d44a01c38b33c699cbde657a1"
+    "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0c29485d61a615c12d233ae04d3da7beb090d8f00921a02ac75cafa5d344e77b",
+    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6fc699747acbc064380536614d62b3e42bfc2ac3193e745eea5dbe2f70e9f7d8"
   }
 }

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

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

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:7e7cbbd272f3726ae258d68f0dcb253821fd99261e5d203c054ecb4e420991a2
+    digest: sha256:a3d8cbbcd7c046c9b704ebb406b862927161782c98b84f387b35485d3cce5c15

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

@@ -1,8 +1,8 @@
 {
   "release": {
-    "base": "4.20.0-0.nightly-arm64-2025-06-03-221556"
+    "base": "4.20.0-0.nightly-arm64-2025-06-10-104243"
   },
   "images": {
-    "kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9e926daf273610546a48a70ef1a13b947cb7fae882701a06f54c90ed476315d2"
+    "kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dd63c583d4ea81c1107bec33b976dd09ac14c2f7b3d2dd15705560144715b75c"
   }
 }

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

@@ -1,8 +1,8 @@
 {
   "release": {
-    "base": "4.20.0-0.nightly-2025-06-02-175911"
+    "base": "4.20.0-0.nightly-2025-06-09-022311"
   },
   "images": {
-    "kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7e7cbbd272f3726ae258d68f0dcb253821fd99261e5d203c054ecb4e420991a2"
+    "kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a3d8cbbcd7c046c9b704ebb406b862927161782c98b84f387b35485d3cce5c15"
   }
 }

assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml

@@ -2,26 +2,26 @@
 images:
   - name: quay.io/operator-framework/olm
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:094d52fee038ff8f4961434613150a0be7541d9de11a758208781004820bca25
+    digest: sha256:117a1bea1bfc44ec5fe833a2c20c25c1def7bcad5bc5bc5bd5f877d313e1ccf6
   - name: quay.io/operator-framework/configmap-operator-registry
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:d4d208179c4266e6ed1f6d5454de98ddd22cc5c3bd8ac71d37d74fe836fb416b
+    digest: sha256:5be65eb73a404bf1ac8a861d84c3c3628ac4847338bd54ec83dbcc74c3401f8c
   - name: quay.io/openshift/origin-kube-rbac-proxy
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:268ef89dd78b673cf808e13f4f266423ba6e06c6cba8184a7be7f526b009f5f2
+    digest: sha256:52a3ce5ce4d6795776bb620869c17ccee1c8e99250df12c95f6c92cef5a2558f
 
 patches:
   - patch: |-
      - op: add
        path: /spec/template/spec/containers/0/env/-
        value:
          name: OPERATOR_REGISTRY_IMAGE 
-         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d4d208179c4266e6ed1f6d5454de98ddd22cc5c3bd8ac71d37d74fe836fb416b
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5be65eb73a404bf1ac8a861d84c3c3628ac4847338bd54ec83dbcc74c3401f8c
      - op: add
        path: /spec/template/spec/containers/0/env/-
        value:
          name: OLM_IMAGE 
-         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:094d52fee038ff8f4961434613150a0be7541d9de11a758208781004820bca25
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:117a1bea1bfc44ec5fe833a2c20c25c1def7bcad5bc5bc5bd5f877d313e1ccf6
     target:
       kind: Deployment
       labelSelector: app=catalog-operator

assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml

@@ -2,26 +2,26 @@
 images:
   - name: quay.io/operator-framework/olm
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:81a3dd0a164921a49d1256c2a0288027b95776b497cb28485a2c9fa8b6437233
+    digest: sha256:8632421fd3c8f0436b72e1513838d51a052fae3fc00e71e38dbe5aa32ac724e8
   - name: quay.io/operator-framework/configmap-operator-registry
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:cb2dbffe55b7e4a7abb2cad5e3ee3bdfc70b50f7791d6eba5869deacb65469ee
+    digest: sha256:aa95ec952df438087b265ed667d4d9f29ecfdfa089de6dbfb21420a581dbc07e
   - name: quay.io/openshift/origin-kube-rbac-proxy
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:a6966ecebd2bceadcb15a49867289ee899325db83f052ef817f7a8a68d0ae12f
+    digest: sha256:8dd51f479223c70466cb72570f309bccf56a64d3bd9d637c90466d4b417ab745
 
 patches:
   - patch: |-
      - op: add
        path: /spec/template/spec/containers/0/env/-
        value:
          name: OPERATOR_REGISTRY_IMAGE 
-         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cb2dbffe55b7e4a7abb2cad5e3ee3bdfc70b50f7791d6eba5869deacb65469ee
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:aa95ec952df438087b265ed667d4d9f29ecfdfa089de6dbfb21420a581dbc07e
      - op: add
        path: /spec/template/spec/containers/0/env/-
        value:
          name: OLM_IMAGE 
-         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:81a3dd0a164921a49d1256c2a0288027b95776b497cb28485a2c9fa8b6437233
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8632421fd3c8f0436b72e1513838d51a052fae3fc00e71e38dbe5aa32ac724e8
     target:
       kind: Deployment
       labelSelector: app=catalog-operator

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

@@ -1,10 +1,10 @@
 {
   "release": {
-    "base": "4.20.0-0.nightly-arm64-2025-06-03-221556"
+    "base": "4.20.0-0.nightly-arm64-2025-06-10-104243"
   },
   "images": {
-    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:094d52fee038ff8f4961434613150a0be7541d9de11a758208781004820bca25",
-    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d4d208179c4266e6ed1f6d5454de98ddd22cc5c3bd8ac71d37d74fe836fb416b",
-    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:268ef89dd78b673cf808e13f4f266423ba6e06c6cba8184a7be7f526b009f5f2"
+    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:117a1bea1bfc44ec5fe833a2c20c25c1def7bcad5bc5bc5bd5f877d313e1ccf6",
+    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5be65eb73a404bf1ac8a861d84c3c3628ac4847338bd54ec83dbcc74c3401f8c",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:52a3ce5ce4d6795776bb620869c17ccee1c8e99250df12c95f6c92cef5a2558f"
   }
 }

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

@@ -1,10 +1,10 @@
 {
   "release": {
-    "base": "4.20.0-0.nightly-2025-06-02-175911"
+    "base": "4.20.0-0.nightly-2025-06-09-022311"
   },
   "images": {
-    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:81a3dd0a164921a49d1256c2a0288027b95776b497cb28485a2c9fa8b6437233",
-    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cb2dbffe55b7e4a7abb2cad5e3ee3bdfc70b50f7791d6eba5869deacb65469ee",
-    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a6966ecebd2bceadcb15a49867289ee899325db83f052ef817f7a8a68d0ae12f"
+    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8632421fd3c8f0436b72e1513838d51a052fae3fc00e71e38dbe5aa32ac724e8",
+    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:aa95ec952df438087b265ed667d4d9f29ecfdfa089de6dbfb21420a581dbc07e",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8dd51f479223c70466cb72570f309bccf56a64d3bd9d637c90466d4b417ab745"
   }
 }

assets/release/release-aarch64.json

@@ -1,16 +1,16 @@
 {
   "release": {
-    "base": "4.20.0-0.nightly-arm64-2025-06-03-221556"
+    "base": "4.20.0-0.nightly-arm64-2025-06-10-104243"
   },
   "images": {
-    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7ad39ac965500d3bc19d61e883abbecdf0ea1a5c0e3aac093597de848ef05319",
-    "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f448878d7e606d48948d04025b586dcbe60d9db40e21448f4399368beae02d75",
-    "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4f69b20b5666a2dc8fa9c551d3a5e8af410b79fbeac36ec8091e3f65d0721947",
-    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:268ef89dd78b673cf808e13f4f266423ba6e06c6cba8184a7be7f526b009f5f2",
-    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:10e226538b18adf26a662ec0604d3359077e114bdac609195a89d49730e358b5",
-    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:99b77b160a54c8b8b57bf8c1e2a7e8d33968a4fe9e2e322ae8ff0df924fdf0ba",
-    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:837f35648549165bbd82a9bb3ca06e874b33da04229c8249a626503273c5d9be",
+    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3a37601da3b60b328906b2a0315a496ebd30e2eefdd658880012f4832f60b276",
+    "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e37e5214eaae1a24cfdd0bc0a13f65e33d387bf63c1a0bf713846d70a579f575",
+    "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:67b3b7530ab198bf69ca948774c74d8038238bed15564be2e1c8869b0bfadcac",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:52a3ce5ce4d6795776bb620869c17ccee1c8e99250df12c95f6c92cef5a2558f",
+    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2f824ce9c21a6317e9ec985b000a01b076f4b55d8a2716eec339d7ae260f91f4",
+    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5a79e416d1d5e27e28e4721ace6eac7395ec64576eccd32f087248406bc2168b",
+    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0f71369afacdc54e6558630432f0e3bc1e76dd7314e001a52c2f1e9b16419b20",
     "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:0689e27defe411a07da33e339ec65df67e09a3a7080b8e5494fae5cb1a35db36",
-    "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:60d2d6c80029456376b49ae2144a8a02fc87ffe12736172945c9246cf904bed2"
+    "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7aed4d69044060d5e024ff2c3976ff3f85d08f3b744ed4e0f39612f0d520960e"
   }
 }

assets/release/release-x86_64.json

@@ -1,16 +1,16 @@
 {
   "release": {
-    "base": "4.20.0-0.nightly-2025-06-02-175911"
+    "base": "4.20.0-0.nightly-2025-06-09-022311"
   },
   "images": {
-    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f54512d947414b124dfa622fc36ac1c058983564d965b0e1cd4eecfe300bafec",
-    "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b4165cc25cb8f9d7f02f3c93ce3fc8d4c3e629a9153b31adad52052a66fab72b",
-    "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a8ceaace40aeda99a6ef6c0ff788b8ae36dcfae302177f55335447d2a67e98c3",
-    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a6966ecebd2bceadcb15a49867289ee899325db83f052ef817f7a8a68d0ae12f",
-    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e9627409fb87a4aa9e6fe185f8ce063967663a168c5357ecdba22ef709e63faa",
-    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e8f0a096829cfd7de6731e8f4bd0b7cf4f2f29fc4d0ff281091ea6f2187adad7",
-    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0313311054eeb5e01aed4e36262e4ef77ae8b8c775d61979b73328754870e1c8",
+    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:97a3a5c2f413120117385f4623179cd473fda1abd85940f2441a93105567a568",
+    "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8672c2261502668773a59c7239662b5f4799c14c9fe15508e73d467c4947700f",
+    "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7d57d6798bcbea0c2fd3e4067d107506170c62b3c79654b46d51d16636e2d3cf",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8dd51f479223c70466cb72570f309bccf56a64d3bd9d637c90466d4b417ab745",
+    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6a95fe7d5cd9e074c4d41a54cf9896017e986f9ff59556d40ce4c11410da0b08",
+    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b5e0e424f81e1c4ce91b8411d84b82143ee346d5d245f0c862ae4d22f7a1a95c",
+    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2c8f0d7b39287215c6f98962d54fae0961b1a0f3e282d8a63792aa9a823441ab",
     "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:b372811ed8263f80c0903a63e9fd9d05d4dbf2b4d7adcb32304108124841e5bc",
-    "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8dcea554b4e1baebda4d82e9779b7bdbc6c3c5df53f6e1b9949cd560c1d3d824"
+    "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0b64e7bc4ab4ea4f6f0affa4b78f214c8cbde9bf398728e8565724475f349b9f"
   }
 }

deps/github.com/openshift/kubernetes/openshift-hack/cmd/k8s-tests-ext/disabled_tests.go

@@ -15,8 +15,6 @@ func filterOutDisabledSpecs(specs et.ExtensionTestSpecs) et.ExtensionTestSpecs {
 			"[Feature:ClusterTrustBundle]",
 			"[Feature:SELinuxMount]",
 			"[FeatureGate:SELinuxMount]",
-			"[Feature:UserNamespacesPodSecurityStandards]",
-			"[Feature:UserNamespacesSupport]", // disabled Beta
 			"[Feature:DynamicResourceAllocation]",
 			"[Feature:VolumeAttributesClass]", // disabled Beta
 			"[sig-cli] Kubectl client Kubectl prune with applyset should apply and prune objects", // Alpha feature since k8s 1.27

deps/github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery/third_party/forked/golang/json/fields.go

@@ -359,8 +359,9 @@ const (
 // 4) simpleLetterEqualFold, no specials, no non-letters.
 //
 // The letters S and K are special because they map to 3 runes, not just 2:
-//  * S maps to s and to U+017F 'ſ' Latin small letter long s
-//  * k maps to K and to U+212A 'K' Kelvin sign
+//   - S maps to s and to U+017F 'ſ' Latin small letter long s
+//   - k maps to K and to U+212A 'K' Kelvin sign
+//
 // See http://play.golang.org/p/tTxjOc0OGo
 //
 // The returned function is specialized for matching against s and

deps/github.com/openshift/kubernetes/staging/src/k8s.io/client-go/third_party/forked/golang/template/exec.go

@@ -1,6 +1,6 @@
-//This package is copied from Go library text/template.
-//The original private functions indirect and printableValue
-//are exported as public functions.
+// This package is copied from Go library text/template.
+// The original private functions indirect and printableValue
+// are exported as public functions.
 package template
 
 import (

deps/github.com/openshift/kubernetes/staging/src/k8s.io/client-go/third_party/forked/golang/template/funcs.go

@@ -1,6 +1,6 @@
-//This package is copied from Go library text/template.
-//The original private functions eq, ge, gt, le, lt, and ne
-//are exported as public functions.
+// This package is copied from Go library text/template.
+// The original private functions eq, ge, gt, le, lt, and ne
+// are exported as public functions.
 package template
 
 import (

deps/github.com/openshift/kubernetes/staging/src/k8s.io/code-generator/third_party/forked/golang/reflect/type.go

@@ -1,6 +1,6 @@
-//This package is copied from Go library reflect/type.go.
-//The struct tag library provides no way to extract the list of struct tags, only
-//a specific tag
+// This package is copied from Go library reflect/type.go.
+// The struct tag library provides no way to extract the list of struct tags, only
+// a specific tag
 package reflect
 
 import (

deps/github.com/openshift/kubernetes/test/e2e/common/node/security_context.go

@@ -87,7 +87,7 @@ var _ = SIGDescribe("Security Context", func() {
 				podClient.DeleteSync(ctx, createdPod2.Name, metav1.DeleteOptions{}, e2epod.DefaultPodDeletionTimeout)
 			})
 			getLogs := func(pod *v1.Pod) (string, error) {
-				err := e2epod.WaitForPodSuccessInNamespaceTimeout(ctx, f.ClientSet, createdPod1.Name, f.Namespace.Name, f.Timeouts.PodStart)
+				err := e2epod.WaitForPodSuccessInNamespaceTimeout(ctx, f.ClientSet, pod.Name, f.Namespace.Name, f.Timeouts.PodStart)
 				if err != nil {
 					return "", err
 				}

etcd/go.mod

@@ -12,7 +12,7 @@ replace (
 
 require (
 	github.com/openshift/api v0.0.0-20250213010142-f5b09d13c01f
-	github.com/openshift/build-machinery-go v0.0.0-20250211133638-a00a772ae1a2
+	github.com/openshift/build-machinery-go v0.0.0-20250602125535-1b6d00b8c37c
 	github.com/spf13/cobra v1.8.1
 	go.etcd.io/etcd/server/v3 v3.5.16
 	k8s.io/apimachinery v1.32.5

etcd/go.sum

@@ -160,8 +160,8 @@ github.com/onsi/gomega v1.35.1 h1:Cwbd75ZBPxFSuZ6T+rN/WCb/gOc6YgFBXLlZLhC7Ds4=
 github.com/onsi/gomega v1.35.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog=
 github.com/openshift/api v0.0.0-20250213010142-f5b09d13c01f h1:HH+BqfxONWB2kknhCLAjiAievsyb56WvLGXdNOseI8g=
 github.com/openshift/api v0.0.0-20250213010142-f5b09d13c01f/go.mod h1:yk60tHAmHhtVpJQo3TwVYq2zpuP70iJIFDCmeKMIzPw=
-github.com/openshift/build-machinery-go v0.0.0-20250211133638-a00a772ae1a2 h1:Pw/OKhN0r8HZcR4No8qh0QygTvuYsDeZhHsK6T9LC+I=
-github.com/openshift/build-machinery-go v0.0.0-20250211133638-a00a772ae1a2/go.mod h1:8jcm8UPtg2mCAsxfqKil1xrmRMI3a+XU2TZ9fF8A7TE=
+github.com/openshift/build-machinery-go v0.0.0-20250602125535-1b6d00b8c37c h1:gJvhduWIrpzoUTwrJjjeul+hGETKkhRhEZosBg/X3Hg=
+github.com/openshift/build-machinery-go v0.0.0-20250602125535-1b6d00b8c37c/go.mod h1:8jcm8UPtg2mCAsxfqKil1xrmRMI3a+XU2TZ9fF8A7TE=
 github.com/openshift/etcd/api/v3 v3.5.1-0.20250411172207-a5421dfe551a h1:xPuKS5jHdAvz/ZnVk1Zib4BFQfQvWGE81l9naQ8+3ok=
 github.com/openshift/etcd/api/v3 v3.5.1-0.20250411172207-a5421dfe551a/go.mod h1:c3aH5wcvXv/9dqIw2Y810LDXJfhSYdHQ0vxmP3CCHVY=
 github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250411172207-a5421dfe551a h1:S+zAlmcKTX+oFurjzztf0+89ySajZpWq9KbjN4VtEB0=