Skip to content

K
k3s
Commit cf3e963d authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #34620 from madhusudancs/fed-update-charts-image-version

Automatic merge from submit-queue [Federation] Fix bash continuation, update charts version and kubeconfig mount permission ```release-note * New federation deployment mechanism now allows non-GCP clusters. * Writes the federation kubeconfig to the local kubeconfig file. ``` cc @kubernetes/sig-cluster-federation
parents 83b2651e 453c46fc
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
federation/deploy/deploy.sh
View file @ cf3e963d
...@@ -38,7 +38,7 @@ source "${KUBE_ROOT}/cluster/lib/logging.sh" ...@@ -38,7 +38,7 @@ source "${KUBE_ROOT}/cluster/lib/logging.sh"
readonly KUBE_ANYWHERE_FEDERATION_IMAGE="gcr.io/madhusudancs-containers/kubernetes-anywhere-federation" readonly KUBE_ANYWHERE_FEDERATION_IMAGE="gcr.io/madhusudancs-containers/kubernetes-anywhere-federation"
readonly KUBE_ANYWHERE_FEDERATION_VERSION="v0.9.0" readonly KUBE_ANYWHERE_FEDERATION_VERSION="v0.9.0"
readonly KUBE_ANYWHERE_FEDERATION_CHARTS_IMAGE="gcr.io/madhusudancs-containers/federation-charts" readonly KUBE_ANYWHERE_FEDERATION_CHARTS_IMAGE="gcr.io/madhusudancs-containers/federation-charts"
readonly KUBE_ANYWHERE_FEDERATION_CHARTS_VERSION="v0.9.0" readonly KUBE_ANYWHERE_FEDERATION_CHARTS_VERSION="v0.9.1"
readonly GOOGLE_APPLICATION_CREDENTIALS="${GOOGLE_APPLICATION_CREDENTIALS:-${HOME}/.config/gcloud/application_default_credentials.json}" readonly GOOGLE_APPLICATION_CREDENTIALS="${GOOGLE_APPLICATION_CREDENTIALS:-${HOME}/.config/gcloud/application_default_credentials.json}"
readonly KUBE_CONFIG_DIR="${KUBE_CONFIG_DIR:-${HOME}/.kube}" readonly KUBE_CONFIG_DIR="${KUBE_CONFIG_DIR:-${HOME}/.kube}"
...@@ -89,13 +89,13 @@ function federation_action() { ...@@ -89,13 +89,13 @@ function federation_action() {
local -r action="${1:-}" local -r action="${1:-}"
kube::log::status "Action: ${action} federation components" kube::log::status "Action: ${action} federation components"
# For non-GKE clusters just mounting kubeconfig is sufficient. But we
# need gcloud credentials for GKE clusters, so we pass both kubeconfig
# and gcloud credentials
docker run \ docker run \
-m 12G \ -m 12G \
# For non-GKE clusters just mounting kubeconfig is sufficient. But we need
# gcloud credentials for GKE clusters, so we pass both kubeconfig and
# gcloud credentials
-v "${GOOGLE_APPLICATION_CREDENTIALS}:/root/.config/gcloud/application_default_credentials.json:ro" \ -v "${GOOGLE_APPLICATION_CREDENTIALS}:/root/.config/gcloud/application_default_credentials.json:ro" \
-v "${KUBE_CONFIG}:/root/.kube/config:ro" \ -v "${KUBE_CONFIG}:/root/.kube/config" \
-v "${FEDERATION_OUTPUT_ROOT}:/_output" \ -v "${FEDERATION_OUTPUT_ROOT}:/_output" \
"${KUBE_ANYWHERE_FEDERATION_CHARTS_IMAGE}:${KUBE_ANYWHERE_FEDERATION_CHARTS_VERSION}" \ "${KUBE_ANYWHERE_FEDERATION_CHARTS_IMAGE}:${KUBE_ANYWHERE_FEDERATION_CHARTS_VERSION}" \
"${action}" "${action}"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment