github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 12:43:23 +00:00
Code Issues Projects Releases Wiki Activity

Use PROVIDER_VARS

Browse Source
This commit is contained in:
Isaac Hollander McCreery 2017-10-19 14:17:46 -07:00
parent 3ee03fd033
commit 6c1f63ab79
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cluster/common.sh
View File

@ -750,11 +750,6 @@ EOF
if [ -n "${ENABLE_CUSTOM_METRICS:-}" ]; then if [ -n "${ENABLE_CUSTOM_METRICS:-}" ]; then
cat >>$file <<EOF cat >>$file <<EOF
ENABLE_CUSTOM_METRICS: $(yaml-quote ${ENABLE_CUSTOM_METRICS}) ENABLE_CUSTOM_METRICS: $(yaml-quote ${ENABLE_CUSTOM_METRICS})
EOF
fi
if [ -n "${ENABLE_METADATA_CONCEALMENT:-}" ]; then
cat >>$file <<EOF
ENABLE_METADATA_CONCEALMENT: $(yaml-quote ${ENABLE_METADATA_CONCEALMENT})
EOF EOF
fi fi
if [ -n "${FEATURE_GATES:-}" ]; then if [ -n "${FEATURE_GATES:-}" ]; then

4
cluster/gce/config-default.sh
View File

@ -158,9 +158,11 @@ fi
# #
# TODO(#8867) Enable by default. # TODO(#8867) Enable by default.
ENABLE_METADATA_CONCEALMENT="${ENABLE_METADATA_CONCEALMENT:-false}" # true, false ENABLE_METADATA_CONCEALMENT="${ENABLE_METADATA_CONCEALMENT:-false}" # true, false
# Apply the right node label if metadata concealment is on.
if [[ ${ENABLE_METADATA_CONCEALMENT:-} == "true" ]]; then 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" NODE_LABELS="${NODE_LABELS},beta.kubernetes.io/metadata-proxy-ready=true"
# Add to the provider custom variables.
PROVIDER_VARS="${PROVIDER_VARS:-} ENABLE_METADATA_CONCEALMENT"
fi fi
# Optional: Enable node logging. # Optional: Enable node logging.

4
cluster/gce/config-test.sh
View File

@ -207,9 +207,11 @@ fi
# Enable metadata concealment by firewalling pod traffic to the metadata server # Enable metadata concealment by firewalling pod traffic to the metadata server
# and run a proxy daemonset on nodes. # and run a proxy daemonset on nodes.
ENABLE_METADATA_CONCEALMENT="${ENABLE_METADATA_CONCEALMENT:-true}" # true, false ENABLE_METADATA_CONCEALMENT="${ENABLE_METADATA_CONCEALMENT:-true}" # true, false
# Apply the right node label if metadata concealment is on.
if [[ ${ENABLE_METADATA_CONCEALMENT:-} == "true" ]]; then 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" NODE_LABELS="${NODE_LABELS},beta.kubernetes.io/metadata-proxy-ready=true"
# Add to the provider custom variables.
PROVIDER_VARS="${PROVIDER_VARS:-} ENABLE_METADATA_CONCEALMENT"
fi fi
# Optional: Enable node logging. # Optional: Enable node logging.