From 1b1249714a7714898706820e6a3c91f6d64df9b8 Mon Sep 17 00:00:00 2001 From: Shubhada Date: Thu, 1 Aug 2024 13:14:02 -0700 Subject: [PATCH] Set INSTALLER_PULLSPEC dynamically using the extracted OpenShift version to ensure accurate deployment configurations fixed the env --- env.example | 1 - hack/setup_resources.sh | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/env.example b/env.example index 33eeb221597..f3fb808ff7f 100644 --- a/env.example +++ b/env.example @@ -1,7 +1,6 @@ # use unique prefix for Azure resources when it is set, otherwise use your user's name export AZURE_PREFIX="${AZURE_PREFIX:-$USER}" export LOCATION=westeurope -export ARO_IMAGE=arointsvc.azurecr.io/aro:latest export NO_CACHE=false export AZURE_EXTENSION_DEV_SOURCES="$(pwd)/python" diff --git a/hack/setup_resources.sh b/hack/setup_resources.sh index 29b6e4af0c6..b33f1c19607 100755 --- a/hack/setup_resources.sh +++ b/hack/setup_resources.sh @@ -21,9 +21,9 @@ fi # Extract version and pullspec from const.go OPENSHIFT_VERSION=$(awk -F'[(,)]' '/NewVersion/ {gsub(/ /, ""); print $2"."$3"."$4; exit}' "$CONST_GO_PATH") OCP_PULLSPEC=$(awk -F'"' '/PullSpec:/ {print $2; exit}' "$CONST_GO_PATH") -INSTALLER_PULLSPEC="arointsvc.azurecr.io/aro-installer:release-$OPENSHIFT_VERSION" -# Print the fetched values for verification +# Set the INSTALLER_PULLSPEC +INSTALLER_PULLSPEC="arointsvc.azurecr.io/aro-installer:release-$OPENSHIFT_VERSION" echo "Using OpenShift version: $OPENSHIFT_VERSION" echo "Using OCP_PULLSPEC: $OCP_PULLSPEC" echo "Using INSTALLER_PULLSPEC: $INSTALLER_PULLSPEC"