Merge pull request #47624 from caseydavenport/fix-typha

Automatic merge from submit-queue Don't start any Typha instances if not using Calico **What this PR does / why we need it**: Don't start any Typha instances if Calico isn't being used. A recent change now includes all add-ons on the master, but we don't always want a Typha replica. **Which issue this PR fixes** Fixes https://github.com/kubernetes/kubernetes/issues/47622 **Release note**: ```release-note NONE ``` cc @dnardo

Merge pull request #47624 from caseydavenport/fix-typha
6742fda0 · Kubernetes Submit Queue · GitHub · 7831a542 · 199ecdbb · 6742fda0
Commit 6742fda0 authored Jun 15, 2017 by Kubernetes Submit Queue Committed by GitHub Jun 15, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 0 deletions

configure-helper.sh cluster/gce/container-linux/configure-helper.sh +4 -0

configure-helper.sh cluster/gce/gci/configure-helper.sh +4 -0

No files found.
--- 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}"
 }


--- 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}"
 }