Skip to content
Merged
Show file tree
Hide file tree
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
18 changes: 8 additions & 10 deletions scripts/src/functions.bash
Original file line number Diff line number Diff line change
Expand Up @@ -56,16 +56,14 @@ create_kubeconfig() {
}

ensure_deploy_variables() {
if [[ -n "${KUBE_NAMESPACE}" || -n "${KUBE_URL}" || -n "${KUBE_TOKEN}" || -n "${CI_ENVIRONMENT_SLUG}" || -n "${CI_ENVIRONMENT_URL}" ]]; then
local LEGACY_DEPLOY_VARIABLES VAR_NAME
LEGACY_DEPLOY_VARIABLES=("KUBE_NAMESPACE" "KUBE_URL" "KUBE_TOKEN" "CI_ENVIRONMENT_SLUG" "CI_ENVIRONMENT_URL")
for VAR_NAME in "${LEGACY_DEPLOY_VARIABLES[@]}"; do
if [[ -z "${!VAR_NAME}" ]]; then
echo "Missing ${VAR_NAME}."
exit 1
fi
done
fi
local LEGACY_DEPLOY_VARIABLES VAR_NAME
LEGACY_DEPLOY_VARIABLES=("KUBE_NAMESPACE" "KUBE_URL" "KUBE_TOKEN" "CI_ENVIRONMENT_SLUG" "CI_ENVIRONMENT_URL")
for VAR_NAME in "${LEGACY_DEPLOY_VARIABLES[@]}"; do
if [[ -z "${!VAR_NAME}" ]]; then
echo "Missing ${VAR_NAME}."
exit 1
fi
done
}

ping_kube() {
Expand Down
15 changes: 7 additions & 8 deletions templates/functions/gke-kubeconfig.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,17 +64,16 @@
}

generate_gke_kubeconfig() {
local gcloud_cmd=(
gcloud container clusters get-credentials "${K8S_CLUSTER_NAME}"
--location "${K8S_LOCATION}"
--project "${GCP_PROJECT_ID}"
)

local dns_flag=""
if [ "${K8S_USE_DNS_ENDPOINT:-0}" = "1" ]; then
gcloud_cmd+=(--dns-endpoint)
dns_flag="--dns-endpoint"
fi
Comment on lines 66 to 70

if ! "${gcloud_cmd[@]}"; then
# shellcheck disable=SC2086
if ! gcloud container clusters get-credentials "${K8S_CLUSTER_NAME}" \
--location "${K8S_LOCATION}" \
--project "${GCP_PROJECT_ID}" \
${dns_flag}; then
Comment thread
Syphon83 marked this conversation as resolved.
return 1
fi

Expand Down
Loading