Skip to content

Commit

Permalink
MGMT-15732: Add extra flag var for hypershift install (openshift#5469)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
CrystalChun authored and danielerez committed Oct 15, 2023
1 parent 769fcd1 commit 159dd65
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
3 changes: 2 additions & 1 deletion deploy/operator/capi/deploy_capi_cluster.sh
Expand Up @@ -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"
Expand Down Expand Up @@ -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" ]
Expand Down
3 changes: 2 additions & 1 deletion deploy/operator/hypershift/deploy_hypershift_cluster.sh
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down

0 comments on commit 159dd65

Please sign in to comment.