Rebase fix rebase 5.0 5.0.0 0.nightly 2026 06 27 125119 amd64 2026 06 27 arm64 2026 06 29

Makefile.kube_git.var

@@ -1,5 +1,5 @@
 KUBE_GIT_MAJOR=1
 KUBE_GIT_MINOR=35
 KUBE_GIT_VERSION=v1.35.3
-KUBE_GIT_COMMIT=d8d517e6bbe7cf7359026cac26bb96ea45e18806
+KUBE_GIT_COMMIT=a466682e3867da746be24d7d56c6641612721d6c
 KUBE_GIT_TREE_STATE=clean

Makefile.version.aarch64.var

@@ -1 +1 @@
-OCP_VERSION := 5.0.0-0.nightly-arm64-2026-06-26-004304
+OCP_VERSION := 5.0.0-0.nightly-arm64-2026-06-29-004304

Makefile.version.x86_64.var

@@ -1 +1 @@
-OCP_VERSION := 5.0.0-0.nightly-2026-06-22-235733
+OCP_VERSION := 5.0.0-0.nightly-2026-06-27-125119

assets/components/multus/kustomization.x86_64.yaml

@@ -2,7 +2,7 @@
 images:
   - name: multus-cni-microshift
     newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
-    digest: sha256:a9d3d35047a829e01c1d92ca5bcc61be5bbd960fd3a4df6afc39a404b8319518
+    digest: sha256:1f3cac8edf9340ad5bc75fc46ce481a49c90eddf9b5bc2b1b638df20453f40a2
   - name: containernetworking-plugins-microshift
     newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
-    digest: sha256:28d6bdb3545fa2e102a747ef81cb31b9c31104f1871b3df7bc1f402abe15a365
+    digest: sha256:e812e82436f11ca20322279a6bdf6abf188cfaee35dc253ef8d439f9e7e8290a

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

@@ -1,6 +1,6 @@
 {
   "release": {
-    "base": "5.0.0-0.nightly-arm64-2026-06-26-004304"
+    "base": "5.0.0-0.nightly-arm64-2026-06-29-004304"
   },
   "images": {
     "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:9e60576fdc22edb65d4b1c0add88899e1e73467f8e9760e597606dd0d20acf74",

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

@@ -1,9 +1,9 @@
 {
   "release": {
-    "base": "5.0.0-0.nightly-2026-06-22-235733"
+    "base": "5.0.0-0.nightly-2026-06-27-125119"
   },
   "images": {
-    "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:a9d3d35047a829e01c1d92ca5bcc61be5bbd960fd3a4df6afc39a404b8319518",
-    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:28d6bdb3545fa2e102a747ef81cb31b9c31104f1871b3df7bc1f402abe15a365"
+    "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:1f3cac8edf9340ad5bc75fc46ce481a49c90eddf9b5bc2b1b638df20453f40a2",
+    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:e812e82436f11ca20322279a6bdf6abf188cfaee35dc253ef8d439f9e7e8290a"
   }
 }

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

@@ -2,10 +2,10 @@
 images:
   - name: quay.io/operator-framework/olm
     newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
-    digest: sha256:acbfa4940b62757e08390b1ab9fe2146a1c0b3e6bd6f1f86ef68f69abe174cae
+    digest: sha256:7a4856bead2b2fdbd205fea8f680600cd793a8ccb12dd8f841baf8d2dc83ead0
   - name: quay.io/operator-framework/configmap-operator-registry
     newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
-    digest: sha256:cb8239d35cc360d08085183643cc7592fc7840d34724430c95a96311cd646dc1
+    digest: sha256:5f76ea233034d670bf3fadaa7af0461125a4af7b9096f1dbe42c09b31f0a6297
   - name: quay.io/openshift/origin-kube-rbac-proxy
     newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
     digest: sha256:42657835f0d7e8d3be57c4bb2dd5684fa714e09d47e6585caa81eafc516a73a9
@@ -16,12 +16,12 @@ patches:
        path: /spec/template/spec/containers/0/env/-
        value:
          name: OPERATOR_REGISTRY_IMAGE
-         value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:cb8239d35cc360d08085183643cc7592fc7840d34724430c95a96311cd646dc1
+         value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:5f76ea233034d670bf3fadaa7af0461125a4af7b9096f1dbe42c09b31f0a6297
      - op: add
        path: /spec/template/spec/containers/0/env/-
        value:
          name: OLM_IMAGE
-         value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:acbfa4940b62757e08390b1ab9fe2146a1c0b3e6bd6f1f86ef68f69abe174cae
+         value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:7a4856bead2b2fdbd205fea8f680600cd793a8ccb12dd8f841baf8d2dc83ead0
     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-v5.0-art-dev
-    digest: sha256:a2dc3e608fc0ff145a2d70a44b75b25163398e83326e7d631298fd8c675ed673
+    digest: sha256:9451e3fa30c28a9cf7ff20d36c61e008d2e94b1e050ee42fe90ddc962ff79df2
   - name: quay.io/operator-framework/configmap-operator-registry
     newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
-    digest: sha256:b70b2a91822ee00df433987548dcf2215fcfff6d057b6a95674f8bfd254da746
+    digest: sha256:e4e847d67d44813ae1a3de0114af9d001f7ca1fbd2d07d38ea3c55fcdf205266
   - name: quay.io/openshift/origin-kube-rbac-proxy
     newName: quay.io/openshift-release-dev/ocp-v5.0-art-dev
-    digest: sha256:7f38d322c657bfb06262c03d5e5fb1d746c0bdf8fbd3fb7de61c99daec7ccd9f
+    digest: sha256:65f883d6e3e38a8e060ec79fca150b01d5632cce397f28b588bdd063ff20d2f1
 
 patches:
   - patch: |-
      - op: add
        path: /spec/template/spec/containers/0/env/-
        value:
          name: OPERATOR_REGISTRY_IMAGE
-         value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:b70b2a91822ee00df433987548dcf2215fcfff6d057b6a95674f8bfd254da746
+         value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:e4e847d67d44813ae1a3de0114af9d001f7ca1fbd2d07d38ea3c55fcdf205266
      - op: add
        path: /spec/template/spec/containers/0/env/-
        value:
          name: OLM_IMAGE
-         value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:a2dc3e608fc0ff145a2d70a44b75b25163398e83326e7d631298fd8c675ed673
+         value: quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:9451e3fa30c28a9cf7ff20d36c61e008d2e94b1e050ee42fe90ddc962ff79df2
     target:
       kind: Deployment
       labelSelector: app=catalog-operator

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

@@ -1,10 +1,10 @@
 {
   "release": {
-    "base": "5.0.0-0.nightly-arm64-2026-06-26-004304"
+    "base": "5.0.0-0.nightly-arm64-2026-06-29-004304"
   },
   "images": {
-    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:acbfa4940b62757e08390b1ab9fe2146a1c0b3e6bd6f1f86ef68f69abe174cae",
-    "operator-registry": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:cb8239d35cc360d08085183643cc7592fc7840d34724430c95a96311cd646dc1",
+    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:7a4856bead2b2fdbd205fea8f680600cd793a8ccb12dd8f841baf8d2dc83ead0",
+    "operator-registry": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:5f76ea233034d670bf3fadaa7af0461125a4af7b9096f1dbe42c09b31f0a6297",
     "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:42657835f0d7e8d3be57c4bb2dd5684fa714e09d47e6585caa81eafc516a73a9"
   }
 }

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

@@ -1,10 +1,10 @@
 {
   "release": {
-    "base": "5.0.0-0.nightly-2026-06-22-235733"
+    "base": "5.0.0-0.nightly-2026-06-27-125119"
   },
   "images": {
-    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:a2dc3e608fc0ff145a2d70a44b75b25163398e83326e7d631298fd8c675ed673",
-    "operator-registry": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:b70b2a91822ee00df433987548dcf2215fcfff6d057b6a95674f8bfd254da746",
-    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:7f38d322c657bfb06262c03d5e5fb1d746c0bdf8fbd3fb7de61c99daec7ccd9f"
+    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:9451e3fa30c28a9cf7ff20d36c61e008d2e94b1e050ee42fe90ddc962ff79df2",
+    "operator-registry": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:e4e847d67d44813ae1a3de0114af9d001f7ca1fbd2d07d38ea3c55fcdf205266",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:65f883d6e3e38a8e060ec79fca150b01d5632cce397f28b588bdd063ff20d2f1"
   }
 }

assets/release/release-aarch64.json

@@ -1,15 +1,15 @@
 {
   "release": {
-    "base": "5.0.0-0.nightly-arm64-2026-06-26-004304"
+    "base": "5.0.0-0.nightly-arm64-2026-06-29-004304"
   },
   "images": {
     "cli": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:1a9ec7c1e5686f2fc9e8abfd9023db7c86eb4f887424279a1c8fc706b5d7e964",
     "coredns": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:c087d736a14e2c829662e7756c1a4d0b7a0bdaaa5c525d356a7707ea603a59a0",
-    "haproxy-router": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:562a43a33241d3ec0f251873033e2fc849d71f33ee58ee6b03ee8fbbfae32355",
+    "haproxy-router": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:259a30da3ed99f41311c6eb43c87fd55c300f74dd240f1a43c368fc0da35dabb",
     "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:42657835f0d7e8d3be57c4bb2dd5684fa714e09d47e6585caa81eafc516a73a9",
-    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:19da252fc46f4c73fced39bd74b2b83897d98eb17ee475bd17dab30b9e78d762",
+    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:5c057f9ef8033a4e29d05c3970dce1616f647d925de94208338ad2b1471729f4",
     "pod": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:16823f30ee96ae299566616a6e486ba3a2a84879dddde65902879bbb5f09aa1b",
-    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:f7241abc3a04ded867b4f78e3a42e2f745353e1add2abdb130fb3e5548791712",
+    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:59e7dd3e46e825d14c1116e4deffde0fd30e09835e48cebd1fb1431f2265a639",
     "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:e77365e44676fbd8ab9e4ce53f3a406856bbdfef3467c545a7df1197d84477af",
     "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:1aaebc52233be6105ac2784c13eeee8b7815d0a76f9e1d5e4a90709e67caa607"
   }

assets/release/release-x86_64.json

@@ -1,16 +1,16 @@
 {
   "release": {
-    "base": "5.0.0-0.nightly-2026-06-22-235733"
+    "base": "5.0.0-0.nightly-2026-06-27-125119"
   },
   "images": {
-    "cli": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:176dab12e26180cee8f53c117623e8f037ad621462597beb3be961a8906f6125",
-    "coredns": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:3a41f61b268daf3fdb4fe33a57059c33ea4434bf7530f41521a1cdae2adc5e81",
-    "haproxy-router": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:f4a74c11482efa74a1bd2698fb434aa565782b2e23c16702dc94c73ab9234945",
-    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:7f38d322c657bfb06262c03d5e5fb1d746c0bdf8fbd3fb7de61c99daec7ccd9f",
-    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:6fcff26611bf328bfe6f8afa3c3a8a9d9769152a03cba7c5472b39964b277519",
-    "pod": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:67e0a7742de48d09092fd2d1db90dccbd8a06fcb6d4ea3cf97fab4ac55e20dce",
-    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:629f6c322a9c92661e33f68512914b70935d533499af4931243737972dfeaff3",
+    "cli": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:358f6e93398f536e9418da4f83f289563e180f402e979a7e595486cafb386a11",
+    "coredns": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:92b2a4d2ec8788c840049ba964c24c7291a674f2d76d960deb6a48921074ce0c",
+    "haproxy-router": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:48415df920b72184943b203c5987f996d34cf3a434b2b9386040a22f108db739",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:65f883d6e3e38a8e060ec79fca150b01d5632cce397f28b588bdd063ff20d2f1",
+    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:84c30ba6de3831698b6efba8b8fa347911f2cd3443ffb7e08286dd286fd7ba80",
+    "pod": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:fc9caac7b17273593bd7f9033931cb5fa5e939b7cdef971e85fe721a6f11b136",
+    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:6efc80c24e86fa72ae3da77b0ee9931950da9639bc9e321325488a5f8f974d74",
     "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:10c9ccab4f2857d113b55e12cac29aed0dc97d5a4e29ed2e4ea0f77551ee55f8",
-    "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:85abffbdaf1008c9bcb761b68ac8f52247414950128c3dbb7d3a2a20142024f2"
+    "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v5.0-art-dev@sha256:d8cd2ea895df43fda1bcf37b19b6855b8b22dc63380c03af10b82195265cc2c3"
   }
 }

cmd/generate-config/config/config-openapi-spec.json

@@ -878,6 +878,10 @@
             "custom": {
               "description": "custom is a user-defined TLS security profile. Be extremely careful using a custom\nprofile as invalid configurations can be catastrophic. An example custom profile\nlooks like this:\n\n  minTLSVersion: VersionTLS11\n  ciphers:\n    - ECDHE-ECDSA-CHACHA20-POLY1305\n    - ECDHE-RSA-CHACHA20-POLY1305\n    - ECDHE-RSA-AES128-GCM-SHA256\n    - ECDHE-ECDSA-AES128-GCM-SHA256",
               "type": "object",
+              "required": [
+                "ciphers",
+                "minTLSVersion"
+              ],
               "properties": {
                 "ciphers": {
                   "description": "ciphers is used to specify the cipher algorithms that are negotiated\nduring the TLS handshake. Operators may remove entries that their operands\ndo not support. For example, to use only ECDHE-RSA-AES128-GCM-SHA256 (yaml):\n\n  ciphers:\n    - ECDHE-RSA-AES128-GCM-SHA256\n\nTLS 1.3 cipher suites (e.g. TLS_AES_128_GCM_SHA256) are not configurable\nand are always enabled when TLS 1.3 is negotiated.",
@@ -901,22 +905,22 @@
               "nullable": true
             },
             "intermediate": {
-              "description": "intermediate is a TLS profile for use when you do not need compatibility with\nlegacy clients and want to remain highly secure while being compatible with\nmost clients currently in use.\n\nThis profile is equivalent to a Custom profile specified as:\n  minTLSVersion: VersionTLS12\n  ciphers:\n    - TLS_AES_128_GCM_SHA256\n    - TLS_AES_256_GCM_SHA384\n    - TLS_CHACHA20_POLY1305_SHA256\n    - ECDHE-ECDSA-AES128-GCM-SHA256\n    - ECDHE-RSA-AES128-GCM-SHA256\n    - ECDHE-ECDSA-AES256-GCM-SHA384\n    - ECDHE-RSA-AES256-GCM-SHA384\n    - ECDHE-ECDSA-CHACHA20-POLY1305\n    - ECDHE-RSA-CHACHA20-POLY1305",
+              "description": "intermediate is a TLS profile for use when you do not need compatibility with\nlegacy clients and want to remain highly secure while being compatible with\nmost clients currently in use.",
               "type": "object",
               "nullable": true
             },
             "modern": {
-              "description": "modern is a TLS security profile for use with clients that support TLS 1.3 and\ndo not need backward compatibility for older clients.\n\nThis profile is equivalent to a Custom profile specified as:\n  minTLSVersion: VersionTLS13\n  ciphers:\n    - TLS_AES_128_GCM_SHA256\n    - TLS_AES_256_GCM_SHA384\n    - TLS_CHACHA20_POLY1305_SHA256",
+              "description": "modern is a TLS security profile for use with clients that support TLS 1.3 and\ndo not need backward compatibility for older clients.",
               "type": "object",
               "nullable": true
             },
             "old": {
-              "description": "old is a TLS profile for use when services need to be accessed by very old\nclients or libraries and should be used only as a last resort.\n\nThis profile is equivalent to a Custom profile specified as:\n  minTLSVersion: VersionTLS10\n  ciphers:\n    - TLS_AES_128_GCM_SHA256\n    - TLS_AES_256_GCM_SHA384\n    - TLS_CHACHA20_POLY1305_SHA256\n    - ECDHE-ECDSA-AES128-GCM-SHA256\n    - ECDHE-RSA-AES128-GCM-SHA256\n    - ECDHE-ECDSA-AES256-GCM-SHA384\n    - ECDHE-RSA-AES256-GCM-SHA384\n    - ECDHE-ECDSA-CHACHA20-POLY1305\n    - ECDHE-RSA-CHACHA20-POLY1305\n    - ECDHE-ECDSA-AES128-SHA256\n    - ECDHE-RSA-AES128-SHA256\n    - ECDHE-ECDSA-AES128-SHA\n    - ECDHE-RSA-AES128-SHA\n    - ECDHE-ECDSA-AES256-SHA\n    - ECDHE-RSA-AES256-SHA\n    - AES128-GCM-SHA256\n    - AES256-GCM-SHA384\n    - AES128-SHA256\n    - AES128-SHA\n    - AES256-SHA\n    - DES-CBC3-SHA",
+              "description": "old is a TLS profile for use when services need to be accessed by very old\nclients or libraries and should be used only as a last resort.",
               "type": "object",
               "nullable": true
             },
             "type": {
-              "description": "type is one of Old, Intermediate, Modern or Custom. Custom provides the\nability to specify individual TLS security profile parameters.\n\nThe profiles are based on version 5.7 of the Mozilla Server Side TLS\nconfiguration guidelines. The cipher lists consist of the configuration's\n\"ciphersuites\" followed by the Go-specific \"ciphers\" from the guidelines.\nSee: https://ssl-config.mozilla.org/guidelines/5.7.json\n\nThe profiles are intent based, so they may change over time as new ciphers are\ndeveloped and existing ciphers are found to be insecure. Depending on\nprecisely which ciphers are available to a process, the list may be reduced.",
+              "description": "type is one of Old, Intermediate, Modern or Custom. Custom provides the\nability to specify individual TLS security profile parameters.\n\nThe profiles are based on the Mozilla Server Side TLS configuration\nguidelines. The cipher lists consist of the configuration's\n\"ciphersuites\" followed by the \"ciphers\" from the guidelines.\n\nThe profiles are intent based, so they may change over time as new ciphers are\ndeveloped and existing ciphers are found to be insecure. Depending on\nprecisely which ciphers are available to a process, the list may be reduced.",
               "type": "string",
               "enum": [
                 "Old",

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

@@ -70,16 +70,17 @@ func main() {
 		Qualifiers: []string{withExcludedTestsFilter(`(name.contains('[Serial]') || labels.exists(l, l == '[Serial]')) && labels.exists(l, l == "Conformance")`)},
 	})
 
-	// AddGlobalSuite so the umbrella starts with zero qualifiers and inherits
-	// exclusively from its children via mergeParentQualifiers in origin.
-	kubeTestsExtension.AddGlobalSuite(e.Suite{
-		Name: "kubernetes/conformance",
+	// kubernetes/conformance is used by OCPT to run the minimal true upstream
+	// Kubernetes conformance tests, not the broader view OCP takes of what
+	// "conformance" means.
+	kubeTestsExtension.AddSuite(e.Suite{
+		Name:       "kubernetes/conformance",
+		Qualifiers: []string{withExcludedTestsFilter(`labels.exists(l, l == "Conformance")`)},
 	})
 
 	kubeTestsExtension.AddSuite(e.Suite{
 		Name: "kubernetes/conformance/parallel",
 		Parents: []string{
-			"kubernetes/conformance",
 			"openshift/conformance/parallel",
 		},
 		Qualifiers: []string{withExcludedTestsFilter(`(!name.contains('[Serial]') && !labels.exists(l, l == '[Serial]'))`)},
@@ -88,7 +89,6 @@ func main() {
 	kubeTestsExtension.AddSuite(e.Suite{
 		Name: "kubernetes/conformance/serial",
 		Parents: []string{
-			"kubernetes/conformance",
 			"openshift/conformance/serial",
 		},
 		Qualifiers: []string{withExcludedTestsFilter(`(name.contains('[Serial]') || labels.exists(l, l == '[Serial]'))`)},