Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down Expand Up @@ -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 \
Expand Down