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
This commit is contained in:
Kubernetes Submit Queue 2017-06-15 22:58:31 -07:00 committed by GitHub
commit 6742fda0bb
2 changed files with 8 additions and 0 deletions

View File

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

View File

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