From 159dd6591f883948ef98551b4cdc874e876f2019 Mon Sep 17 00:00:00 2001 From: Crystal Chun Date: Thu, 14 Sep 2023 17:36:39 -0700 Subject: [PATCH] MGMT-15732: Add extra flag var for hypershift install (#5469) https://issues.redhat.com/browse/MGMT-15732 Hypershift install command can change or require additional flags such as in this issue. This adds the variable in case we need to pass such flags in the future CI tests. --- deploy/operator/capi/deploy_capi_cluster.sh | 3 ++- deploy/operator/hypershift/deploy_hypershift_cluster.sh | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/deploy/operator/capi/deploy_capi_cluster.sh b/deploy/operator/capi/deploy_capi_cluster.sh index 9148c7e16c9..d624d73bebe 100755 --- a/deploy/operator/capi/deploy_capi_cluster.sh +++ b/deploy/operator/capi/deploy_capi_cluster.sh @@ -25,6 +25,7 @@ export LOAD_BALANCER_IP="${LOAD_BALANCER_IP:-192.168.111.1}" export HYPERSHIFT_IMAGE="${HYPERSHIFT_IMAGE:-quay.io/hypershift/hypershift-operator:latest}" export CONTROL_PLANE_OPERATOR_IMAGE="${CONTROL_PLANE_OPERATOR_IMAGE:-}" export PROVIDER_IMAGE="${PROVIDER_IMAGE:-}" +export EXTRA_HYPERSHIFT_INSTALL_FLAGS="${EXTRA_HYPERSHIFT_INSTALL_FLAGS}" if [[ ${SPOKE_CONTROLPLANE_AGENTS} -eq 1 ]]; then export USER_MANAGED_NETWORKING="true" @@ -109,7 +110,7 @@ function hypershift() { } echo "Installing HyperShift using upstream image" -hypershift install --hypershift-image $HYPERSHIFT_IMAGE --namespace hypershift +hypershift install --hypershift-image $HYPERSHIFT_IMAGE --namespace hypershift $EXTRA_HYPERSHIFT_INSTALL_FLAGS wait_for_pods "hypershift" if [ -z "$PROVIDER_IMAGE" ] diff --git a/deploy/operator/hypershift/deploy_hypershift_cluster.sh b/deploy/operator/hypershift/deploy_hypershift_cluster.sh index c7246686779..294df429a23 100755 --- a/deploy/operator/hypershift/deploy_hypershift_cluster.sh +++ b/deploy/operator/hypershift/deploy_hypershift_cluster.sh @@ -23,6 +23,7 @@ export CLUSTER_HOST_PREFIX="${CLUSTER_HOST_PREFIX_V4}" export EXTERNAL_SUBNET="${EXTERNAL_SUBNET_V4}" export SERVICE_SUBNET="${SERVICE_SUBNET_V4}" export PUBLIC_CONTAINER_REGISTRIES="${PUBLIC_CONTAINER_REGISTRIES:-quay.io}" +export EXTRA_HYPERSHIFT_INSTALL_FLAGS="${EXTRA_HYPERSHIFT_INSTALL_FLAGS}" set -o nounset set -o pipefail @@ -51,7 +52,7 @@ oc get namespace "${HYPERSHIFT_AGENT_NS}" || oc create namespace "${HYPERSHIFT_A oc patch storageclass assisted-service -p '{"metadata": {"annotations":{"storageclass.kubernetes.io/is-default-class":"true"}}}' echo "Installing HyperShift using upstream image" -hypershift install --hypershift-image $HYPERSHIFT_IMAGE --namespace hypershift +hypershift install --hypershift-image $HYPERSHIFT_IMAGE --namespace hypershift $EXTRA_HYPERSHIFT_INSTALL_FLAGS wait_for_pods "hypershift" echo "Creating HostedCluster"