From 199ecdbbddda8bf0a6d43a60e24114df4666e65a Mon Sep 17 00:00:00 2001
From: Casey Davenport <casey@tigera.io>
Date: Thu, 15 Jun 2017 17:09:17 -0700
Subject: [PATCH] Don't start any Typha instances if not using Calico

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

diff --git a/cluster/gce/container-linux/configure-helper.sh b/cluster/gce/container-linux/configure-helper.sh
index 78ec9dcdcdd..c6dcdd52876 100755
--- a/cluster/gce/container-linux/configure-helper.sh
+++ b/cluster/gce/container-linux/configure-helper.sh
@@ -66,6 +66,10 @@ function get-calico-typha-replicas {
   if [[ "${NUM_NODES}" -gt "500" ]]; then
     typha_count=5
   fi
+  if [[ "${NETWORK_POLICY_PROVIDER:-}" != "calico" ]]; then
+    # We're not configured to use Calico, so don't start any Typhas.
+    typha_count=0
+  fi
   echo "${typha_count}"
 }
 
diff --git a/cluster/gce/gci/configure-helper.sh b/cluster/gce/gci/configure-helper.sh
index 91fe619b571..6e5327d5361 100644
--- a/cluster/gce/gci/configure-helper.sh
+++ b/cluster/gce/gci/configure-helper.sh
@@ -64,6 +64,10 @@ function get-calico-typha-replicas {
   if [[ "${NUM_NODES}" -gt "500" ]]; then
     typha_count=5
   fi
+  if [[ "${NETWORK_POLICY_PROVIDER:-}" != "calico" ]]; then
+    # We're not configured to use Calico, so don't start any Typhas.
+    typha_count=0
+  fi
   echo "${typha_count}"
 }