github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Set GCE_ALPHA_FEATURES environment variable in gce.conf

Browse Source
This commit is contained in:
Yu-Ju Hong
2017-08-22 17:14:45 -07:00
parent 6858bb4e60
commit ab07115ff2
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cluster/gce/container-linux/configure-helper.sh
View File

@@ -264,6 +264,12 @@ EOF
use_cloud_config="true" use_cloud_config="true"
cat <<EOF >>/etc/gce.conf cat <<EOF >>/etc/gce.conf
multizone = ${MULTIZONE} multizone = ${MULTIZONE}
EOF
fi
if [[ -n "${GCE_ALPHA_FEATURES:-}" ]]; then
use_cloud_config="true"
cat <<EOF >>/etc/gce.conf
alpha-features = ${GCE_ALPHA_FEATURES}
EOF EOF
fi fi
if [[ "${use_cloud_config}" != "true" ]]; then if [[ "${use_cloud_config}" != "true" ]]; then

6
cluster/gce/gci/configure-helper.sh
View File

@@ -425,6 +425,12 @@ EOF
use_cloud_config="true" use_cloud_config="true"
cat <<EOF >>/etc/gce.conf cat <<EOF >>/etc/gce.conf
multizone = ${MULTIZONE} multizone = ${MULTIZONE}
EOF
fi
if [[ -n "${GCE_ALPHA_FEATURES:-}" ]]; then
use_cloud_config="true"
cat <<EOF >>/etc/gce.conf
alpha-features = ${GCE_ALPHA_FEATURES}
EOF EOF
fi fi
if [[ "${use_cloud_config}" != "true" ]]; then if [[ "${use_cloud_config}" != "true" ]]; then