From 2e8014c092def144ef1370378145d685bc49d919 Mon Sep 17 00:00:00 2001 From: Andrey Lebedev Date: Fri, 6 Mar 2026 15:15:51 +0100 Subject: [PATCH] OCPBUGS-45921: Use HighlyAvailable infra policy for HyperShift serial conformance tests The e2e-aws-ovn-conformance-serial test creates a HyperShift hosted cluster with 3 worker nodes but SingleReplica infrastructure topology (the default). This causes the ingress controller to run with only 1 replica, making it vulnerable to NoExecute taint eviction from serial conformance tests like kubectl taint [1]. Switching to HighlyAvailable ensures 2 router replicas so a single-node taint doesn't cause full ingress unavailability. [1] https://github.com/kubernetes/kubernetes/blob/8911a2d/test/e2e/kubectl/kubectl.go#L1772 --- .../hypershift/openshift-hypershift-release-4.19__periodics.yaml | 1 + .../hypershift/openshift-hypershift-release-4.20__periodics.yaml | 1 + .../hypershift/openshift-hypershift-release-4.21__periodics.yaml | 1 + .../hypershift/openshift-hypershift-release-4.22__periodics.yaml | 1 + 4 files changed, 4 insertions(+) diff --git a/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.19__periodics.yaml b/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.19__periodics.yaml index 63f7895945f61..e9bee942ffad3 100644 --- a/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.19__periodics.yaml +++ b/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.19__periodics.yaml @@ -142,6 +142,7 @@ tests: steps: cluster_profile: hypershift-aws env: + HYPERSHIFT_INFRA_AVAILABILITY_POLICY: HighlyAvailable TEST_SUITE: openshift/conformance/serial workflow: hypershift-aws-conformance - as: e2e-aws-ovn-conformance diff --git a/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.20__periodics.yaml b/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.20__periodics.yaml index 0c1bda62dd638..10f3dba12a966 100644 --- a/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.20__periodics.yaml +++ b/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.20__periodics.yaml @@ -142,6 +142,7 @@ tests: steps: cluster_profile: hypershift-aws env: + HYPERSHIFT_INFRA_AVAILABILITY_POLICY: HighlyAvailable TEST_SUITE: openshift/conformance/serial workflow: hypershift-aws-conformance - as: e2e-aws-ovn-conformance diff --git a/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.21__periodics.yaml b/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.21__periodics.yaml index 250557c15341d..3c1f2469b147d 100644 --- a/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.21__periodics.yaml +++ b/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.21__periodics.yaml @@ -150,6 +150,7 @@ tests: steps: cluster_profile: hypershift-aws env: + HYPERSHIFT_INFRA_AVAILABILITY_POLICY: HighlyAvailable TEST_SUITE: openshift/conformance/serial workflow: hypershift-aws-conformance - as: e2e-aws-ovn-conformance diff --git a/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.22__periodics.yaml b/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.22__periodics.yaml index 0f901a507e85a..d58b144322fa7 100644 --- a/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.22__periodics.yaml +++ b/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.22__periodics.yaml @@ -150,6 +150,7 @@ tests: steps: cluster_profile: hypershift-aws env: + HYPERSHIFT_INFRA_AVAILABILITY_POLICY: HighlyAvailable TEST_SUITE: openshift/conformance/serial workflow: hypershift-aws-conformance - as: e2e-aws-ovn-conformance