From eb67655a0d4c5f26e6689f251e3ee1dd958193dd Mon Sep 17 00:00:00 2001 From: Seth Jennings Date: Wed, 25 Feb 2026 11:37:15 -0600 Subject: [PATCH 1/3] Revert "hypershift: fix capk image env var" This reverts commit 12b7ec1ab1323339641e5823531b4ac5182033e8. --- .../hypershift/install/hypershift-install-commands.sh | 10 ---------- .../hypershift-kubevirt-e2e-nested-workflow.yaml | 1 - .../hypershift-kubevirt-install-hypershift-commands.sh | 1 + 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/ci-operator/step-registry/hypershift/install/hypershift-install-commands.sh b/ci-operator/step-registry/hypershift/install/hypershift-install-commands.sh index bab2a9d70dfe4..4a7383aeb11a6 100755 --- a/ci-operator/step-registry/hypershift/install/hypershift-install-commands.sh +++ b/ci-operator/step-registry/hypershift/install/hypershift-install-commands.sh @@ -157,16 +157,6 @@ case "${CLOUD_PROVIDER}" in oc wait --for=condition=Available --namespace hypershift deployments/operator --timeout=300s ;; - Kubevirt) - "${HCP_CLI}" install --hypershift-image="${OPERATOR_IMAGE}" \ - --additional-operator-env-vars="IMAGE_KUBEVIRT_CAPI_PROVIDER=registry.ci.openshift.org/ocp/4.18:cluster-api-provider-kubevirt" \ - --platform-monitoring=All \ - --enable-ci-debug-output \ - --pull-secret=/etc/ci-pull-credentials/.dockerconfigjson \ - --wait-until-available \ - ${EXTRA_ARGS} - ;; - *) "${HCP_CLI}" install --hypershift-image="${OPERATOR_IMAGE}" \ --platform-monitoring=All \ diff --git a/ci-operator/step-registry/hypershift/kubevirt/e2e-nested/hypershift-kubevirt-e2e-nested-workflow.yaml b/ci-operator/step-registry/hypershift/kubevirt/e2e-nested/hypershift-kubevirt-e2e-nested-workflow.yaml index 227fbe93b943d..a8570b471dd01 100644 --- a/ci-operator/step-registry/hypershift/kubevirt/e2e-nested/hypershift-kubevirt-e2e-nested-workflow.yaml +++ b/ci-operator/step-registry/hypershift/kubevirt/e2e-nested/hypershift-kubevirt-e2e-nested-workflow.yaml @@ -15,7 +15,6 @@ workflow: HYPERSHIFT_ZONES: "us-east-1a" RUN_EXTERNAL_INFRA_TEST: "false" RUN_HOSTEDCLUSTER_CREATION: "true" - CLOUD_PROVIDER: "Kubevirt" pre: - ref: ipi-install-rbac - chain: hypershift-setup-nested-management-cluster diff --git a/ci-operator/step-registry/hypershift/kubevirt/install/hypershift/hypershift-kubevirt-install-hypershift-commands.sh b/ci-operator/step-registry/hypershift/kubevirt/install/hypershift/hypershift-kubevirt-install-hypershift-commands.sh index 5307e931130d6..dec64ead7ff3f 100644 --- a/ci-operator/step-registry/hypershift/kubevirt/install/hypershift/hypershift-kubevirt-install-hypershift-commands.sh +++ b/ci-operator/step-registry/hypershift/kubevirt/install/hypershift/hypershift-kubevirt-install-hypershift-commands.sh @@ -11,6 +11,7 @@ then fi export KUBECONFIG=${SHARED_DIR}/nested_kubeconfig +export IMAGE_KUBEVIRT_CAPI_PROVIDER="registry.ci.openshift.org/ocp/4.18:cluster-api-provider-kubevirt" OPERATOR_IMAGE=${HYPERSHIFT_RELEASE_LATEST} From 792be1a6662ae83792e4eb701d1160ef4acd3c8b Mon Sep 17 00:00:00 2001 From: Seth Jennings Date: Wed, 25 Feb 2026 11:38:03 -0600 Subject: [PATCH 2/3] Revert "hypershift: kubevirt: specify capk provider image for CI" This reverts commit 357cb7827c5987b831267ec5143065e48799f869. --- .../hypershift-kubevirt-install-hypershift-commands.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/ci-operator/step-registry/hypershift/kubevirt/install/hypershift/hypershift-kubevirt-install-hypershift-commands.sh b/ci-operator/step-registry/hypershift/kubevirt/install/hypershift/hypershift-kubevirt-install-hypershift-commands.sh index dec64ead7ff3f..5307e931130d6 100644 --- a/ci-operator/step-registry/hypershift/kubevirt/install/hypershift/hypershift-kubevirt-install-hypershift-commands.sh +++ b/ci-operator/step-registry/hypershift/kubevirt/install/hypershift/hypershift-kubevirt-install-hypershift-commands.sh @@ -11,7 +11,6 @@ then fi export KUBECONFIG=${SHARED_DIR}/nested_kubeconfig -export IMAGE_KUBEVIRT_CAPI_PROVIDER="registry.ci.openshift.org/ocp/4.18:cluster-api-provider-kubevirt" OPERATOR_IMAGE=${HYPERSHIFT_RELEASE_LATEST} From ffc54d158ee1549a197819fc8bdf519c3454a91a Mon Sep 17 00:00:00 2001 From: Seth Jennings Date: Wed, 25 Feb 2026 11:43:33 -0600 Subject: [PATCH 3/3] hypershift: rework setting capk provider in hypershift-install flow --- .../hypershift/install/hypershift-install-commands.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ci-operator/step-registry/hypershift/install/hypershift-install-commands.sh b/ci-operator/step-registry/hypershift/install/hypershift-install-commands.sh index 4a7383aeb11a6..564e863e74c65 100755 --- a/ci-operator/step-registry/hypershift/install/hypershift-install-commands.sh +++ b/ci-operator/step-registry/hypershift/install/hypershift-install-commands.sh @@ -55,6 +55,8 @@ if [ "${TEST_CPO_OVERRIDE}" == "1" ]; then EXTRA_ARGS="${EXTRA_ARGS} --enable-cpo-overrides" fi +EXTRA_ARGS="${EXTRA_ARGS} --additional-operator-env-vars=IMAGE_KUBEVIRT_CAPI_PROVIDER=registry.ci.openshift.org/ocp/4.18:cluster-api-provider-kubevirt" + case "${CLOUD_PROVIDER}" in AWS) "${HCP_CLI}" install --hypershift-image="${OPERATOR_IMAGE}" \