Skip to content

K
k3s
Commit 6742fda0 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

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
parents 7831a542 199ecdbb
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 0 deletions
cluster/gce/container-linux/configure-helper.sh
View file @ 6742fda0
...@@ -66,6 +66,10 @@ function get-calico-typha-replicas { ...@@ -66,6 +66,10 @@ function get-calico-typha-replicas {
if [[ "${NUM_NODES}" -gt "500" ]]; then if [[ "${NUM_NODES}" -gt "500" ]]; then
typha_count=5 typha_count=5
fi 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}" echo "${typha_count}"
} }
......
cluster/gce/gci/configure-helper.sh
View file @ 6742fda0
...@@ -64,6 +64,10 @@ function get-calico-typha-replicas { ...@@ -64,6 +64,10 @@ function get-calico-typha-replicas {
if [[ "${NUM_NODES}" -gt "500" ]]; then if [[ "${NUM_NODES}" -gt "500" ]]; then
typha_count=5 typha_count=5
fi 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}" echo "${typha_count}"
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment