NO-ISSUE: rebase-main-4.20.0-0.nightly-2025-06-20-214016_amd64-2025-06-20_arm64-2025-06-23

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=d92880b14300b76b867a83ec887e280a5b77b52e
 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-23-215538

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-20-214016

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:50b773f7c9216f37ef2da5d1d8365db2b5b33fbcd07e58fa4729f798d71eb600
   - name: containernetworking-plugins-microshift
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:844c2c27fea94063bbd30bf41bd5751c270160834ac16ca645c30a96e8f968b0
+    digest: sha256:063b1f2597ac54ad15a2c6cfc16d3a7a79e4943b571bea43a9629e9b2d8050b3

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:3d9f7262c02f2397a56b9f83de5565342563173aab799204c9d240c99ba851fa
   - name: containernetworking-plugins-microshift
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:5ffc236accd1d6054bb53a794dfc7eee8b7f703d44a01c38b33c699cbde657a1
+    digest: sha256:32c69f5819b3ec0bdc9e6296aebb64c26d8845943857f1c44095379de92969c3

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-23-215538"
   },
   "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:50b773f7c9216f37ef2da5d1d8365db2b5b33fbcd07e58fa4729f798d71eb600",
+    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:063b1f2597ac54ad15a2c6cfc16d3a7a79e4943b571bea43a9629e9b2d8050b3"
   }
 }

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-20-214016"
   },
   "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:3d9f7262c02f2397a56b9f83de5565342563173aab799204c9d240c99ba851fa",
+    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:32c69f5819b3ec0bdc9e6296aebb64c26d8845943857f1c44095379de92969c3"
   }
 }

assets/controllers/kube-apiserver/defaultconfig.yaml

@@ -70,8 +70,6 @@ apiServerArguments:
     - TaintNodesByCondition
     - ValidatingAdmissionWebhook
     - ValidatingAdmissionPolicy
-    - authorization.openshift.io/RestrictSubjectBindings
-    - authorization.openshift.io/ValidateRoleBindingRestriction
     - config.openshift.io/DenyDeleteClusterConfiguration
     - config.openshift.io/ValidateAPIServer
     - config.openshift.io/ValidateAuthentication

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:74d456bd5c891d05c8fcb0eaaa6bc22201a7508726b7df33b6cf7ebbf6953649

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:e73c2485b0b50c8dccaedea2311aad6ee3036377d8ae8047a26bc2a2f4b6c549

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-23-215538"
   },
   "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:74d456bd5c891d05c8fcb0eaaa6bc22201a7508726b7df33b6cf7ebbf6953649"
   }
 }

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-20-214016"
   },
   "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:e73c2485b0b50c8dccaedea2311aad6ee3036377d8ae8047a26bc2a2f4b6c549"
   }
 }

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:f079e6e1a8d9dff4ec0fad81af24c55f776db8c242b848f169abdc6c5c0baa44
   - name: quay.io/operator-framework/configmap-operator-registry
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:d4d208179c4266e6ed1f6d5454de98ddd22cc5c3bd8ac71d37d74fe836fb416b
+    digest: sha256:06ba6d0fea93e8d9d3e45fc3e254deaa9482d80d45c2aacc1ef996e9b3ae2592
   - name: quay.io/openshift/origin-kube-rbac-proxy
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:268ef89dd78b673cf808e13f4f266423ba6e06c6cba8184a7be7f526b009f5f2
+    digest: sha256:b7a036bc5af4e1e65e4b6e4cfa82e51db746f6e74fbf9d5530430269c191ba2e
 
 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:06ba6d0fea93e8d9d3e45fc3e254deaa9482d80d45c2aacc1ef996e9b3ae2592
      - 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:f079e6e1a8d9dff4ec0fad81af24c55f776db8c242b848f169abdc6c5c0baa44
     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:9dc4358e925dc1dc81f9427514708943a2715eae86a8852ba2e92321ad8a0d86
   - name: quay.io/operator-framework/configmap-operator-registry
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:cb2dbffe55b7e4a7abb2cad5e3ee3bdfc70b50f7791d6eba5869deacb65469ee
+    digest: sha256:445d517dd9a06261876e48fe4770b3ed4205e9e2d56a9cf23977cffcbcedcea0
   - name: quay.io/openshift/origin-kube-rbac-proxy
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:a6966ecebd2bceadcb15a49867289ee899325db83f052ef817f7a8a68d0ae12f
+    digest: sha256:997327803da16f984825119d4e77f9bda5d4c702195463a984b0a7c67c41ab3f
 
 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:445d517dd9a06261876e48fe4770b3ed4205e9e2d56a9cf23977cffcbcedcea0
      - 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:9dc4358e925dc1dc81f9427514708943a2715eae86a8852ba2e92321ad8a0d86
     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-23-215538"
   },
   "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:f079e6e1a8d9dff4ec0fad81af24c55f776db8c242b848f169abdc6c5c0baa44",
+    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:06ba6d0fea93e8d9d3e45fc3e254deaa9482d80d45c2aacc1ef996e9b3ae2592",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b7a036bc5af4e1e65e4b6e4cfa82e51db746f6e74fbf9d5530430269c191ba2e"
   }
 }

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-20-214016"
   },
   "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:9dc4358e925dc1dc81f9427514708943a2715eae86a8852ba2e92321ad8a0d86",
+    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:445d517dd9a06261876e48fe4770b3ed4205e9e2d56a9cf23977cffcbcedcea0",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:997327803da16f984825119d4e77f9bda5d4c702195463a984b0a7c67c41ab3f"
   }
 }

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-23-215538"
   },
   "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:2c5ded62f40a1fc8283db75a6c915ec7c9cd5306baf83b00e755a9ca96379fa1",
+    "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:22d93ca4a3808b25e1d41dbb94ce72bb85919eb1d0b83fc78df10e13c164e139",
+    "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:68218c9b80d3ddda8707d180842fae71c63f2b8ee952b917c667ebc9b87321b7",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b7a036bc5af4e1e65e4b6e4cfa82e51db746f6e74fbf9d5530430269c191ba2e",
+    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:886b4344ec4aa793d648106d536dad02db91c2ecf4fc8636d0068cdcbf3a330a",
+    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4de6b28e54e478eeb02d7a3336384408441c10c2d2c400f1ca3d59288211f26c",
+    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a83eb86a5be6f8b75292a13de20a4374996a48b0f26a675e7fa4c7a73516a781",
     "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:a6441ff3e2c347a12d9bae0fdd55be6d0f9cf74e99fc14cc31e2b152b49eec61"
   }
 }

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-20-214016"
   },
   "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:64e75c90e9f9a6ab779a939dd4a9f702f5a89f8a7b527e1507a6be6716274e96",
+    "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3ae5042b13d85dc3468f14cc4965ed41cf6e3079c9742911fb7107c4c9fb3215",
+    "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5f7e1af518a8959e7dd7e86b6333cd11cdc859522a53145a8cc9fd66a97fe22f",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:997327803da16f984825119d4e77f9bda5d4c702195463a984b0a7c67c41ab3f",
+    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8a611e730a21f73af0b8640e144bd7504b8badde0e9ba4493778d77901e4f9ac",
+    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:efc88fe98bb6c628d08bac26a529e7e859309d58f9460b045f0584fd6d31e0f6",
+    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5675cb173bcf6b221d214cc26c1f0619ab67129e8681a3af92c3d5596f23e11b",
     "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:59f0d645823ec364d6f295d244cf21b0d51d85dc9566df4e3435ad0f6b1a6371"
   }
 }

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/openshift-hack/cmd/k8s-tests-ext/k8s-tests.go

@@ -2,11 +2,13 @@ package main
 
 import (
 	"flag"
+	"fmt"
 	"os"
 	"reflect"
 	"strconv"
 
 	et "github.com/openshift-eng/openshift-tests-extension/pkg/extension/extensiontests"
+
 	"k8s.io/kubernetes/openshift-hack/e2e/annotate/generated"
 	"k8s.io/kubernetes/test/e2e/framework"
 
@@ -51,22 +53,36 @@ func main() {
 	extensionRegistry.Register(kubeTestsExtension)
 
 	// Carve up the kube tests into our openshift suites...
+	kubeTestsExtension.AddSuite(e.Suite{
+		Name: "kubernetes/conformance/parallel/minimal",
+		Parents: []string{
+			"openshift/conformance/parallel/minimal",
+		},
+		Qualifiers: []string{withExcludedTestsFilter(`!name.contains('[Serial]') && labels.exists(l, l == "Conformance")`)},
+	})
+
+	kubeTestsExtension.AddSuite(e.Suite{
+		Name: "kubernetes/conformance/serial/minimal",
+		Parents: []string{
+			"openshift/conformance/serial/minimal",
+		},
+		Qualifiers: []string{withExcludedTestsFilter(`name.contains('[Serial]') && labels.exists(l, l == "Conformance")`)},
+	})
+
 	kubeTestsExtension.AddSuite(e.Suite{
 		Name: "kubernetes/conformance/parallel",
 		Parents: []string{
 			"openshift/conformance/parallel",
-			"openshift/conformance/parallel/minimal",
 		},
-		Qualifiers: []string{`!labels.exists(l, l == "Serial") && labels.exists(l, l == "Conformance")`},
+		Qualifiers: []string{withExcludedTestsFilter(`!name.contains('[Serial]')`)},
 	})
 
 	kubeTestsExtension.AddSuite(e.Suite{
 		Name: "kubernetes/conformance/serial",
 		Parents: []string{
 			"openshift/conformance/serial",
-			"openshift/conformance/serial/minimal",
 		},
-		Qualifiers: []string{`labels.exists(l, l == "Serial") && labels.exists(l, l == "Conformance")`},
+		Qualifiers: []string{withExcludedTestsFilter(`name.contains('[Serial]')`)},
 	})
 
 	for k, v := range image.GetOriginalImageConfigs() {
@@ -160,3 +176,27 @@ func convertToImage(obj interface{}) extension.Image {
 	}
 	return image
 }
+
+func withExcludedTestsFilter(baseExpr string) string {
+	excluded := []string{
+		"[Disabled:",
+		"[Disruptive]",
+		"[Skipped]",
+		"[Slow]",
+		"[Flaky]",
+		"[Local]",
+	}
+
+	filter := ""
+	for i, s := range excluded {
+		if i > 0 {
+			filter += " && "
+		}
+		filter += fmt.Sprintf("!name.contains('%s')", s)
+	}
+
+	if baseExpr != "" {
+		return fmt.Sprintf("(%s) && (%s)", baseExpr, filter)
+	}
+	return filter
+}

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 (