Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

HOSTEDCP-999: Minor fixes for disconnected CAPI CI #5713

Merged
merged 1 commit into from Nov 21, 2023
+4 −4
Merged

HOSTEDCP-999: Minor fixes for disconnected CAPI CI #5713

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions deploy/operator/capi/deploy_capi_cluster.sh
View file
Open in desktop
Expand Up @@ -59,8 +59,8 @@ elif [[ "${IP_STACK}" == "v4v6" ]]; then
export CLUSTER_HOST_PREFIX_ADDITIONAL="${CLUSTER_HOST_PREFIX_V6}"
export EXTERNAL_SUBNET_ADDITIONAL="${EXTERNAL_SUBNET_V6}"
export SERVICE_SUBNET_ADDITIONAL="${SERVICE_SUBNET_V6}"
# IPv6 requires hypershift create cluster cidr override
export EXTRA_HYPERSHIFT_CREATE_COMMANDS="$EXTRA_HYPERSHIFT_CREATE_COMMANDS --cluster-cidr fd01::/48"
# IPv6 requires hypershift create cluster and service cidr overrides
export EXTRA_HYPERSHIFT_CREATE_COMMANDS="$EXTRA_HYPERSHIFT_CREATE_COMMANDS --cluster-cidr fd01::/48 --service-cidr fd02::/112"
fi

if [ "${DISCONNECTED}" = "true" ]; then
Expand Down Expand Up @@ -158,7 +158,7 @@ function hypershift_cli() {
then
hypershift "$@"
else
podman run -it --net host --rm --entrypoint /usr/bin/hypershift -v $KUBECONFIG:/root/.kube/config -v $ASSISTED_PULLSECRET_JSON:/root/pull-secret.json -v /root/.ssh/id_rsa.pub:/root/.ssh/id_rsa.pub $HYPERSHIFT_IMAGE "$@"
podman run -it --net host --rm --entrypoint /usr/bin/hypershift -v $KUBECONFIG:/root/.kube/config -v $ASSISTED_PULLSECRET_JSON:$ASSISTED_PULLSECRET_JSON -v /root/.ssh/id_rsa.pub:/root/.ssh/id_rsa.pub $HYPERSHIFT_IMAGE "$@"
fi
}

Expand Down Expand Up @@ -191,7 +191,7 @@ else
fi

echo "Creating HostedCluster"
hypershift_cli create cluster agent --name $ASSISTED_CLUSTER_NAME --base-domain redhat.example --pull-secret /root/pull-secret.json \
hypershift_cli create cluster agent --name $ASSISTED_CLUSTER_NAME --base-domain redhat.example --pull-secret $ASSISTED_PULLSECRET_JSON \
--ssh-key /root/.ssh/id_rsa.pub --agent-namespace $SPOKE_NAMESPACE --namespace $SPOKE_NAMESPACE \
--release-image ${ASSISTED_OPENSHIFT_INSTALL_RELEASE_IMAGE:-${RELEASE_IMAGE}} \
$CONTROL_PLANE_OPERATOR_FLAG_FOR_CREATE_COMMAND \
Expand Down