From 9c95143365ef34ce8fb9b5b11f1080ef339cc447 Mon Sep 17 00:00:00 2001
From: Yu-Ju Hong <yjhong@google.com>
Date: Tue, 5 Sep 2017 10:35:36 -0700
Subject: [PATCH] GCE: pass GCE_ALPHA_FEATURES if it is set

---
 cluster/gce/config-default.sh | 6 ++++++
 cluster/gce/config-test.sh    | 5 +++++
 2 files changed, 11 insertions(+)

diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh
index e37c6d21799..fd3fbce4d36 100755
--- a/cluster/gce/config-default.sh
+++ b/cluster/gce/config-default.sh
@@ -238,6 +238,12 @@ if [ ${ENABLE_IP_ALIASES} = true ]; then
   PROVIDER_VARS="${PROVIDER_VARS:-} ENABLE_IP_ALIASES"
 fi
 
+
+# Enable GCE Alpha features.
+if [[ -n "${GCE_ALPHA_FEATURES:-}" ]]; then
+  PROVIDER_VARS="${PROVIDER_VARS:-} GCE_ALPHA_FEATURES"
+fi
+
 # Admission Controllers to invoke prior to persisting objects in cluster
 # If we included ResourceQuota, we should keep it at the end of the list to prevent incrementing quota usage prematurely.
 ADMISSION_CONTROL=Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,Priority,ResourceQuota
diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh
index 47c2b275bdf..e4f612b26fc 100755
--- a/cluster/gce/config-test.sh
+++ b/cluster/gce/config-test.sh
@@ -282,6 +282,11 @@ if [ ${ENABLE_IP_ALIASES} = true ]; then
   PROVIDER_VARS="${PROVIDER_VARS:-} ENABLE_IP_ALIASES"
 fi
 
+# Enable GCE Alpha features.
+if [[ -n "${GCE_ALPHA_FEATURES:-}" ]]; then
+  PROVIDER_VARS="${PROVIDER_VARS:-} GCE_ALPHA_FEATURES"
+fi
+
 # If we included ResourceQuota, we should keep it at the end of the list to prevent incrementing quota usage prematurely.
 ADMISSION_CONTROL="${KUBE_ADMISSION_CONTROL:-Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,PodPreset,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,Priority,ResourceQuota}"