mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-22 11:21:47 +00:00
Merge pull request #27466 from madhusudancs/fed-dns-scope
Automatic merge from submit-queue Move GCE NODE_SCOPES to config-common.sh and enable DNS scope in GKE. Follow up to #27357 cc @colhom @kubernetes/sig-cluster-federation []()
This commit is contained in:
commit
7ab303efbe
@ -35,3 +35,9 @@ function get-master-size {
|
||||
fi
|
||||
echo "${suggested_master_size}"
|
||||
}
|
||||
|
||||
if [[ "${FEDERATION:-}" == true ]]; then
|
||||
NODE_SCOPES="${NODE_SCOPES:-compute-rw,monitoring,logging-write,storage-ro,https://www.googleapis.com/auth/ndev.clouddns.readwrite}"
|
||||
else
|
||||
NODE_SCOPES="${NODE_SCOPES:-compute-rw,monitoring,logging-write,storage-ro}"
|
||||
fi
|
||||
|
@ -57,7 +57,6 @@ MASTER_TAG="${INSTANCE_PREFIX}-master"
|
||||
NODE_TAG="${INSTANCE_PREFIX}-minion"
|
||||
CLUSTER_IP_RANGE="${CLUSTER_IP_RANGE:-10.180.0.0/14}"
|
||||
MASTER_IP_RANGE="${MASTER_IP_RANGE:-10.246.0.0/24}"
|
||||
NODE_SCOPES="${NODE_SCOPES:-compute-rw,monitoring,logging-write,storage-ro}"
|
||||
RUNTIME_CONFIG="${KUBE_RUNTIME_CONFIG:-}"
|
||||
TERMINATED_POD_GC_THRESHOLD=${TERMINATED_POD_GC_THRESHOLD:-100}
|
||||
|
||||
|
@ -28,9 +28,13 @@ FIREWALL_SSH="${FIREWALL_SSH:-${NETWORK}-allow-ssh}"
|
||||
GCLOUD="${GCLOUD:-gcloud}"
|
||||
CMD_GROUP="${CMD_GROUP:-}"
|
||||
GCLOUD_CONFIG_DIR="${GCLOUD_CONFIG_DIR:-${HOME}/.config/gcloud/kubernetes}"
|
||||
NODE_SCOPES="${NODE_SCOPES:-"compute-rw,storage-ro"}"
|
||||
MACHINE_TYPE="${MACHINE_TYPE:-n1-standard-2}"
|
||||
IMAGE_TYPE="${IMAGE_TYPE:-}"
|
||||
if [[ "${FEDERATION:-}" == true ]]; then
|
||||
NODE_SCOPES="${NODE_SCOPES:-compute-rw,storage-ro,https://www.googleapis.com/auth/ndev.clouddns.readwrite}"
|
||||
else
|
||||
NODE_SCOPES="${NODE_SCOPES:-compute-rw,storage-ro}"
|
||||
fi
|
||||
|
||||
# WARNING: any new vars added here must correspond to options that can be
|
||||
# passed to `gcloud {CMD_GROUP} container clusters create`, or they will
|
||||
|
Loading…
Reference in New Issue
Block a user