From ab07115ff2c4da031f98edf94dece9e349fb4afc Mon Sep 17 00:00:00 2001
From: Yu-Ju Hong <yjhong@google.com>
Date: Tue, 22 Aug 2017 17:14:45 -0700
Subject: [PATCH] Set GCE_ALPHA_FEATURES environment variable in gce.conf

---
 cluster/gce/container-linux/configure-helper.sh | 6 ++++++
 cluster/gce/gci/configure-helper.sh             | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/cluster/gce/container-linux/configure-helper.sh b/cluster/gce/container-linux/configure-helper.sh
index b2aaee20d92..19cd83997d1 100755
--- a/cluster/gce/container-linux/configure-helper.sh
+++ b/cluster/gce/container-linux/configure-helper.sh
@@ -264,6 +264,12 @@ EOF
     use_cloud_config="true"
     cat <<EOF >>/etc/gce.conf
 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
   fi
   if [[ "${use_cloud_config}" != "true" ]]; then
diff --git a/cluster/gce/gci/configure-helper.sh b/cluster/gce/gci/configure-helper.sh
index 80492da07d2..339ccfa391e 100644
--- a/cluster/gce/gci/configure-helper.sh
+++ b/cluster/gce/gci/configure-helper.sh
@@ -425,6 +425,12 @@ EOF
     use_cloud_config="true"
     cat <<EOF >>/etc/gce.conf
 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
   fi
   if [[ "${use_cloud_config}" != "true" ]]; then