From e524b1e2d0f54ff98f71abe64329e2541ef6ac73 Mon Sep 17 00:00:00 2001 From: Cristiano Veiga Date: Thu, 4 Jun 2026 15:47:56 -0400 Subject: [PATCH] fix(hypershift/gcp): unpin CAPG image override (GCP-426) HyperShift's CAPI CRDs now serve v1beta2, so the pinned CAPG image override is no longer needed. Co-Authored-By: Claude Sonnet 4.6 --- .../hypershift/gcp/create/hypershift-gcp-create-chain.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ci-operator/step-registry/hypershift/gcp/create/hypershift-gcp-create-chain.yaml b/ci-operator/step-registry/hypershift/gcp/create/hypershift-gcp-create-chain.yaml index 855028e64556a..ae5957ae07475 100644 --- a/ci-operator/step-registry/hypershift/gcp/create/hypershift-gcp-create-chain.yaml +++ b/ci-operator/step-registry/hypershift/gcp/create/hypershift-gcp-create-chain.yaml @@ -43,9 +43,6 @@ chain: RELEASE_IMAGE="${OCP_IMAGE_LATEST}" - # TODO(GCP-426): Remove CAPG image override once HyperShift's CAPI CRDs serve v1beta2 - CAPG_IMAGE="quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bdec420448b81cc57f5b53bbcf491c0ed53b6e3ca97da722f69f386a373afe50" - # TODO(GCP-440): Remove boot image pin once NodePool controller discovers it from stream metadata GCP_BOOT_IMAGE="${HYPERSHIFT_GCP_BOOT_IMAGE:-projects/rhcos-cloud/global/images/rhcos-9-6-20250925-0-gcp-x86-64}" @@ -77,7 +74,6 @@ chain: --service-account-signing-key-path "${SA_SIGNING_KEY_PATH}" \ --oidc-issuer-url "${OIDC_ISSUER_URL}" \ --boot-image "${GCP_BOOT_IMAGE}" \ - --annotations "hypershift.openshift.io/capi-provider-gcp-image=${CAPG_IMAGE}" \ --annotations "hypershift.openshift.io/pod-security-admission-label-override=baseline" \ --disable-cluster-capabilities Console \ --disable-cluster-capabilities Ingress \