NO-ISSUE: rebase-release-4.21-4.21.0-0.nightly-2025-11-13-042845_amd64-2025-11-13_arm64-2025-11-15

Makefile.kube_git.var

@@ -1,5 +1,5 @@
 KUBE_GIT_MAJOR=1
 KUBE_GIT_MINOR=34
 KUBE_GIT_VERSION=v1.34.1
-KUBE_GIT_COMMIT=9ca60866127994f08fe5ce2b237ef0f3357986de
+KUBE_GIT_COMMIT=891f5bb0306166d5625b89fc8dc86bbc8c85f549
 KUBE_GIT_TREE_STATE=clean

Makefile.version.aarch64.var

@@ -1 +1 @@
-OCP_VERSION := 4.21.0-0.nightly-arm64-2025-11-12-222742
+OCP_VERSION := 4.21.0-0.nightly-arm64-2025-11-15-162742

Makefile.version.x86_64.var

@@ -1 +1 @@
-OCP_VERSION := 4.21.0-0.nightly-2025-11-05-234508
+OCP_VERSION := 4.21.0-0.nightly-2025-11-13-042845

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

@@ -3,6 +3,8 @@ apiVersion: apps/v1
 metadata:
   name: csi-snapshot-controller
   namespace: kube-system
+  labels:
+    hypershift.openshift.io/managed-by: csi-snapshot-controller-operator
 spec:
   serviceName: "csi-snapshot-controller"
   # Replicas for HyperShift. On standalone OCP it will be adjusted according to nr. of master nodes.

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:b72804fdb79a127961c76187bfb215e7279975467b9e0ac9ea02fc8c38833f04
+    digest: sha256:9acfd5c49fb1f0688946e07a76342fdd0a88ba831c7ee16cbc56a01620bd46ee
   - name: containernetworking-plugins-microshift
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:6c6a2d7d2b7aecc27579c37363159e9b3f268ec23368b83626ab0f523f89da5e
+    digest: sha256:e615c627a4c26fca8fccb8e963892aeef8132968889267b730259d77f3158781

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:9911528df809594adb3387f01e19d8f3c638744ccef5d8cd888b01e4f42c0d93
+    digest: sha256:0fa62f63b7b2b1303fe6058c1f4f15223ec4391f404c08f7832110a0e8c58d26
   - name: containernetworking-plugins-microshift
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:8b195554644abf79b4a5e4c88177c45e2e0745bd062ddedd718112ef057cf1bb
+    digest: sha256:1203e9f2b45f759865a80214a440fab276c8eb04ee98b0a15596be456d4badf2

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

@@ -1,9 +1,9 @@
 {
   "release": {
-    "base": "4.21.0-0.nightly-arm64-2025-11-12-222742"
+    "base": "4.21.0-0.nightly-arm64-2025-11-15-162742"
   },
   "images": {
-    "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b72804fdb79a127961c76187bfb215e7279975467b9e0ac9ea02fc8c38833f04",
-    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6c6a2d7d2b7aecc27579c37363159e9b3f268ec23368b83626ab0f523f89da5e"
+    "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9acfd5c49fb1f0688946e07a76342fdd0a88ba831c7ee16cbc56a01620bd46ee",
+    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e615c627a4c26fca8fccb8e963892aeef8132968889267b730259d77f3158781"
   }
 }

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

@@ -1,9 +1,9 @@
 {
   "release": {
-    "base": "4.21.0-0.nightly-2025-11-05-234508"
+    "base": "4.21.0-0.nightly-2025-11-13-042845"
   },
   "images": {
-    "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9911528df809594adb3387f01e19d8f3c638744ccef5d8cd888b01e4f42c0d93",
-    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8b195554644abf79b4a5e4c88177c45e2e0745bd062ddedd718112ef057cf1bb"
+    "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0fa62f63b7b2b1303fe6058c1f4f15223ec4391f404c08f7832110a0e8c58d26",
+    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1203e9f2b45f759865a80214a440fab276c8eb04ee98b0a15596be456d4badf2"
   }
 }

assets/components/service-ca/deployment.yaml

@@ -18,22 +18,20 @@ spec:
       name: service-ca
       annotations:
         target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
-        openshift.io/required-scc: restricted-v2
+        openshift.io/required-scc: restricted-v3
       labels:
         app: service-ca
         service-ca: "true"
     spec:
       serviceAccountName: service-ca
+      hostUsers: false
       containers:
         - name: service-ca-controller
           image: '{{ .ReleaseImage.service_ca_operator }}'
           imagePullPolicy: IfNotPresent
-          terminationMessagePolicy: FallbackTo
           command: ["service-ca-operator", "controller"]
           ports:
             - containerPort: 8443
-          securityContext:
-            runAsNonRoot: true
           resources:
             requests:
               memory: 120Mi

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:8c272830119b51eac8c521a0eba355a2ae5221b9621e50443373d607535d5f37
+    digest: sha256:f7ea28aea45a802f49241d32ba11ab42897927a24189e89a71fe2fb1e0ee353a
   - name: quay.io/operator-framework/configmap-operator-registry
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:e2a5bd6c8df3d9a6e093a2b422363d37f5dc2a1798e34c3aa1463c9df56167d7
+    digest: sha256:4ddae73cc6fe0de43c96c2beee8bccfddd65a6c033f1052d9633c4ab84d69690
   - name: quay.io/openshift/origin-kube-rbac-proxy
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:489c58e10fa75dd15d93b2be651738ae4e1f42d1d69045597a86d23910b4282b
+    digest: sha256:7852c13ea03341d10d86917152543a908827ce889b57ac6344e05d9ec12ddf33
 
 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:e2a5bd6c8df3d9a6e093a2b422363d37f5dc2a1798e34c3aa1463c9df56167d7
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4ddae73cc6fe0de43c96c2beee8bccfddd65a6c033f1052d9633c4ab84d69690
      - 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:8c272830119b51eac8c521a0eba355a2ae5221b9621e50443373d607535d5f37
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f7ea28aea45a802f49241d32ba11ab42897927a24189e89a71fe2fb1e0ee353a
     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:ad04c3fb65b216e1e1d6b66985783c5f5dfbee440d2d44f936315ddc4882018a
+    digest: sha256:1978d62c94052bc0c6e94afe49eadba28021e3c6f43dbceab75da78042cfa6ed
   - name: quay.io/operator-framework/configmap-operator-registry
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:9847b196b704fd6f5795dcbcc3d803b3f49da10ca9c573e6fed19b240da7b21b
+    digest: sha256:31aa37d1727d5592d316be6db90b1d1c9cb1b76e23e3f4848a9e4b4a01d033e3
   - name: quay.io/openshift/origin-kube-rbac-proxy
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:259964b66399bb8639633b6015a56f69535ce6569b99e3a913296566e4ee860d
+    digest: sha256:4f59bb39b19d1b2f399f07a143b5a7f28cb5b97da6826a8eecac798fd494c82a
 
 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:9847b196b704fd6f5795dcbcc3d803b3f49da10ca9c573e6fed19b240da7b21b
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:31aa37d1727d5592d316be6db90b1d1c9cb1b76e23e3f4848a9e4b4a01d033e3
      - 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:ad04c3fb65b216e1e1d6b66985783c5f5dfbee440d2d44f936315ddc4882018a
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1978d62c94052bc0c6e94afe49eadba28021e3c6f43dbceab75da78042cfa6ed
     target:
       kind: Deployment
       labelSelector: app=catalog-operator

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

@@ -1,10 +1,10 @@
 {
   "release": {
-    "base": "4.21.0-0.nightly-arm64-2025-11-12-222742"
+    "base": "4.21.0-0.nightly-arm64-2025-11-15-162742"
   },
   "images": {
-    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8c272830119b51eac8c521a0eba355a2ae5221b9621e50443373d607535d5f37",
-    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e2a5bd6c8df3d9a6e093a2b422363d37f5dc2a1798e34c3aa1463c9df56167d7",
-    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:489c58e10fa75dd15d93b2be651738ae4e1f42d1d69045597a86d23910b4282b"
+    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f7ea28aea45a802f49241d32ba11ab42897927a24189e89a71fe2fb1e0ee353a",
+    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4ddae73cc6fe0de43c96c2beee8bccfddd65a6c033f1052d9633c4ab84d69690",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7852c13ea03341d10d86917152543a908827ce889b57ac6344e05d9ec12ddf33"
   }
 }

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

@@ -1,10 +1,10 @@
 {
   "release": {
-    "base": "4.21.0-0.nightly-2025-11-05-234508"
+    "base": "4.21.0-0.nightly-2025-11-13-042845"
   },
   "images": {
-    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ad04c3fb65b216e1e1d6b66985783c5f5dfbee440d2d44f936315ddc4882018a",
-    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9847b196b704fd6f5795dcbcc3d803b3f49da10ca9c573e6fed19b240da7b21b",
-    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:259964b66399bb8639633b6015a56f69535ce6569b99e3a913296566e4ee860d"
+    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1978d62c94052bc0c6e94afe49eadba28021e3c6f43dbceab75da78042cfa6ed",
+    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:31aa37d1727d5592d316be6db90b1d1c9cb1b76e23e3f4848a9e4b4a01d033e3",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4f59bb39b19d1b2f399f07a143b5a7f28cb5b97da6826a8eecac798fd494c82a"
   }
 }

assets/release/release-aarch64.json

@@ -1,16 +1,16 @@
 {
   "release": {
-    "base": "4.21.0-0.nightly-arm64-2025-11-12-222742"
+    "base": "4.21.0-0.nightly-arm64-2025-11-15-162742"
   },
   "images": {
-    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:381bd63c6c4c065f2a853423f629e1f1877898060fff806eaf0f3b548a9a680f",
-    "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6dca8d4fb812b48ad834a296cbfeead941f31608459f25c542965bbe023582bd",
-    "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e7a57e003d1e059683e5d9bb1633335310bd8330f2388a4a19d61519368125a5",
-    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:489c58e10fa75dd15d93b2be651738ae4e1f42d1d69045597a86d23910b4282b",
+    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c268aeb05c0d1b4b95f5d3ba928e36f85721e80597dadd303e96d3534ff5bf8a",
+    "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6425c3ea1bf024645d900df68f43e4500adb997530baeef0d8c956293a75b35f",
+    "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fdcfbee38a92d1ec87cb2df41790f247e76bc40f7782377eb15f59189e8618e8",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7852c13ea03341d10d86917152543a908827ce889b57ac6344e05d9ec12ddf33",
     "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9a9e1e2dff0b52b366036024ecaff25903baab14b03a6b9daba74f6dc9b66441",
-    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:89f83501396ec7a07d7b09b1bccc774dc0afd432eb2031dd19faa3641c2c00dd",
-    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7ead4d908bbf4c93e1870f8f912b9e9a0893be026987ce29ad17757945f0c861",
+    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0e774acbdaca87af06108f8b241157f592f865573723d6ba24725f68679db6a4",
+    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1cb29128534adfdeabd0e0dd130edd2f913adb068e03bf15d41e99ec1fe8ee5e",
     "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:3766640b19c336b443619ecdb35f36b479c79ea71b21de97febf024a5eaf6c84",
-    "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:80258cfd13873a8c44afebccc9c418e2b44396aa103231ce1302c8f4924684d9"
+    "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7881b7740d88f927a60fbbc46bd89d9c252d97a4c5d16f31fdc2d15e8dbb486b"
   }
 }

assets/release/release-x86_64.json

@@ -1,16 +1,16 @@
 {
   "release": {
-    "base": "4.21.0-0.nightly-2025-11-05-234508"
+    "base": "4.21.0-0.nightly-2025-11-13-042845"
   },
   "images": {
-    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dcd343bb5d3a3ec1766440084b4d06f43dc2416a4f39dc16565e394cdd6f6ccf",
-    "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7d880ec2bc1f2e70d60c1fc91af0fedb8ff2ee5261ead5356efa60c95d3ee5d6",
-    "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:086b4263895663cbc94544e41ac197ee96ba661379a498733e1f65f5ce53f1c8",
-    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:259964b66399bb8639633b6015a56f69535ce6569b99e3a913296566e4ee860d",
+    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6a2ae68f6bd94c7ec4dbf5a0c44c5bf1c123d400e68600343819d52c9fae86e6",
+    "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:acc3f9809abc27acbc463dc980e8a942b270855a98b34957224b116e5049193d",
+    "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a78795311707c7ffdcdca53c0581905600751413a9f9a816d51ad94a9470e151",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4f59bb39b19d1b2f399f07a143b5a7f28cb5b97da6826a8eecac798fd494c82a",
     "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ad19c1f0010ebcda83c0f0e9f0b2618f0ccd4353388c8ce668c036a153dc70ab",
-    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d5babf272af40b071d673ca18edc888dc3936bacd3f5b0f75b5c1f8fdbbeb5f8",
-    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e25dfe7283548e4b14decd1d3a774990c08f368ba85b17a804dd157cd3356843",
+    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7f181f0214be48d34125638a8c8004540df2580fbccfa6ad98fbc3fab855d46f",
+    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8d2531309a71ffe4aeae5d511c1743e61324d7997e7ff6ba978ea43c4d4a041d",
     "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:58804d8baf922927b66cec9424d431a3bdb341d207024ce40cc8f0123bac03ee",
-    "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:716e6e57400be2b54fb0ff785b20211730b0d4fb6af4ee0510925c5bfaf66103"
+    "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dcb3a9e252227ea85f26fa515116dd28faba6ee6ce0b218cf7bee3b0a1dc75fd"
   }
 }

deps/github.com/openshift/kubernetes/REBASE.openshift.md

@@ -273,19 +273,20 @@ go mod tidy && go mod vendor
 
 Alternatively, you can edit `go.mod` file manually with your favourite editor and use search&replace.
 
-## Review test annotation rules
+## Review test environmental selection rules
 
-The names of upstream e2e tests are annotated according to the a set of
-[declarative rules](openshift-hack/e2e/annotate/rules.go). These annotations
-are used to group tests into suites and to skip tests that are known not to be
-incompatible with some or all configurations of OpenShift.
+Test environmental selection rules are defined in two files:
+- [disabled_tests.go](openshift-hack/cmd/k8s-tests-ext/disabled_tests.go) - for completely disabled tests
+- [environment_selectors.go](openshift-hack/cmd/k8s-tests-ext/environment_selectors.go) - for conditionally skipped tests
+
+These rules are used to skip tests that are known to be incompatible with some or all configurations of OpenShift.
 
 When performing a rebase, it is important to review the rules to
 ensure they are still relevant:
 
-- [ ] Ensure that `[Disabled:Alpha]` rules are appropriate for the current kube
+- [ ] Ensure that `Alpha` rules in [disabled_tests.go](openshift-hack/cmd/k8s-tests-ext/disabled_tests.go) are appropriate for the current kube
       level. Alpha features that are not enabled by default should be targeted
-      by this annotation to ensure that tests of those features are skipped.
+      by these rules to ensure that tests of those features are skipped.
 - [ ] Add new skips (along with a bz to track resolution) where e2e tests fail
       consistently.
 

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

@@ -5,11 +5,7 @@ import (
 	"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"
 
 	"github.com/spf13/cobra"
@@ -61,31 +57,31 @@ func main() {
 		Parents: []string{
 			"openshift/conformance/parallel/minimal",
 		},
-		Qualifiers: []string{withExcludedTestsFilter(`!name.contains('[Serial]') && labels.exists(l, l == "Conformance")`)},
+		Qualifiers: []string{withExcludedTestsFilter(`(!name.contains('[Serial]') && !labels.exists(l, l == '[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")`)},
+		Qualifiers: []string{withExcludedTestsFilter(`(name.contains('[Serial]') || labels.exists(l, l == '[Serial]')) && labels.exists(l, l == "Conformance")`)},
 	})
 
 	kubeTestsExtension.AddSuite(e.Suite{
 		Name: "kubernetes/conformance/parallel",
 		Parents: []string{
 			"openshift/conformance/parallel",
 		},
-		Qualifiers: []string{withExcludedTestsFilter(`!name.contains('[Serial]')`)},
+		Qualifiers: []string{withExcludedTestsFilter(`(!name.contains('[Serial]') && !labels.exists(l, l == '[Serial]'))`)},
 	})
 
 	kubeTestsExtension.AddSuite(e.Suite{
 		Name: "kubernetes/conformance/serial",
 		Parents: []string{
 			"openshift/conformance/serial",
 		},
-		Qualifiers: []string{withExcludedTestsFilter(`name.contains('[Serial]')`)},
+		Qualifiers: []string{withExcludedTestsFilter(`(name.contains('[Serial]') || labels.exists(l, l == '[Serial]'))`)},
 	})
 
 	for k, v := range image.GetOriginalImageConfigs() {
@@ -109,30 +105,6 @@ func main() {
 		}
 	})
 
-	// Annotations get appended to test names, these are additions to upstream
-	// tests for controlling skips, suite membership, etc.
-	//
-	// TODO:
-	//		- Remove this annotation code, and migrate to Labels/Tags and
-	//		  the environmental skip code from the enhancement once its implemented.
-	//		- Make sure to account for test renames that occur because of removal of these
-	//		  annotations
-	var omitAnnotations bool
-	omitAnnotationsVal := os.Getenv("OMIT_ANNOTATIONS")
-	if omitAnnotationsVal != "" {
-		omitAnnotations, err = strconv.ParseBool(omitAnnotationsVal)
-		if err != nil {
-			panic("Failed to parse OMIT_ANNOTATIONS: " + err.Error())
-		}
-	}
-	if !omitAnnotations {
-		specs.Walk(func(spec *et.ExtensionTestSpec) {
-			if annotations, ok := generated.Annotations[spec.Name]; ok {
-				spec.Name += annotations
-			}
-		})
-	}
-
 	specs = filterOutDisabledSpecs(specs)
 	addLabelsToSpecs(specs)