From 9eba9a7fafe6a30824bf077fd612e2f68d8e1724 Mon Sep 17 00:00:00 2001 From: Aaron Crickenberger Date: Thu, 26 Jul 2018 15:22:06 -0700 Subject: [PATCH] Default some unbound cluster/gce env vars Values based on how they were being used, so the true/false check defaults to false, and the non-empty check defaults to empty --- cluster/gce/config-default.sh | 4 ++++ cluster/gce/config-test.sh | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh index 9a7d51bb1ff..ccf73263225 100755 --- a/cluster/gce/config-default.sh +++ b/cluster/gce/config-default.sh @@ -193,6 +193,7 @@ fi # # TODO(#8867) Enable by default. ENABLE_METADATA_CONCEALMENT="${ENABLE_METADATA_CONCEALMENT:-false}" # true, false +METADATA_CONCEALMENT_NO_FIREWALL="${METADATA_CONCEALMENT_NO_FIREWALL:-false}" # true, false if [[ ${ENABLE_METADATA_CONCEALMENT:-} == "true" ]]; then # Put the necessary label on the node so the daemonset gets scheduled. NODE_LABELS="${NODE_LABELS},beta.kubernetes.io/metadata-proxy-ready=true" @@ -412,6 +413,9 @@ HEAPSTER_GCP_MEMORY_PER_NODE="${HEAPSTER_GCP_MEMORY_PER_NODE:-4}" HEAPSTER_GCP_BASE_CPU="${HEAPSTER_GCP_BASE_CPU:-80m}" HEAPSTER_GCP_CPU_PER_NODE="${HEAPSTER_GCP_CPU_PER_NODE:-0.5}" +# Optional: custom system banner for dashboard addon +CUSTOM_KUBE_DASHBOARD_BANNER="${CUSTOM_KUBE_DASHBOARD_BANNER:-}" + # Default Stackdriver resources version exported by Fluentd-gcp addon LOGGING_STACKDRIVER_RESOURCE_TYPES="${LOGGING_STACKDRIVER_RESOURCE_TYPES:-old}" diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index 60fb56e722f..066ff0f779a 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -229,6 +229,7 @@ fi # Enable metadata concealment by firewalling pod traffic to the metadata server # and run a proxy daemonset on nodes. ENABLE_METADATA_CONCEALMENT="${ENABLE_METADATA_CONCEALMENT:-true}" # true, false +METADATA_CONCEALMENT_NO_FIREWALL="${METADATA_CONCEALMENT_NO_FIREWALL:-false}" # true, false if [[ ${ENABLE_METADATA_CONCEALMENT:-} == "true" ]]; then # Put the necessary label on the node so the daemonset gets scheduled. NODE_LABELS="${NODE_LABELS},beta.kubernetes.io/metadata-proxy-ready=true" @@ -428,6 +429,9 @@ HEAPSTER_GCP_MEMORY_PER_NODE="${HEAPSTER_GCP_MEMORY_PER_NODE:-4}" HEAPSTER_GCP_BASE_CPU="${HEAPSTER_GCP_BASE_CPU:-80m}" HEAPSTER_GCP_CPU_PER_NODE="${HEAPSTER_GCP_CPU_PER_NODE:-0.5}" +# Optional: custom system banner for dashboard addon +CUSTOM_KUBE_DASHBOARD_BANNER="${CUSTOM_KUBE_DASHBOARD_BANNER:-}" + # Default Stackdriver resources version exported by Fluentd-gcp addon LOGGING_STACKDRIVER_RESOURCE_TYPES="${LOGGING_STACKDRIVER_RESOURCE_TYPES:-old}"