C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Repair kube_proxy_exclude_cidrs (#4909)

Browse source
This commit is contained in:
Tony Fouchard 2019-06-28 09:39:37 +02:00 committed by Kubernetes Prow Robot
parent c7f3123e28
commit 216631bf02
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
roles/kubernetes/master/defaults/main/kube-proxy.yml
View file

@ -69,7 +69,7 @@ kube_proxy_min_sync_period: 0s
kube_proxy_sync_period: 30s kube_proxy_sync_period: 30s
# A comma-separated list of CIDR's which the ipvs proxier should not touch when cleaning up IPVS rules. # A comma-separated list of CIDR's which the ipvs proxier should not touch when cleaning up IPVS rules.
kube_proxy_exclude_cidrs: 'null' kube_proxy_exclude_cidrs: []
# The ipvs scheduler type when proxy mode is ipvs # The ipvs scheduler type when proxy mode is ipvs
# rr: round-robin # rr: round-robin

2
roles/kubernetes/master/templates/kubeadm-config.v1alpha3.yaml.j2
View file

@ -277,7 +277,7 @@ iptables:
minSyncPeriod: {{ kube_proxy_min_sync_period }} minSyncPeriod: {{ kube_proxy_min_sync_period }}
syncPeriod: {{ kube_proxy_sync_period }} syncPeriod: {{ kube_proxy_sync_period }}
ipvs: ipvs:
excludeCIDRs: {{ kube_proxy_exclude_cidrs }} excludeCIDRs: {{ "[]" if kube_proxy_exclude_cidrs is not defined or kube_proxy_exclude_cidrs == "null" or kube_proxy_exclude_cidrs | length == 0 else (kube_proxy_exclude_cidrs if kube_proxy_exclude_cidrs[0] == '[' else ("[" + kube_proxy_exclude_cidrs + "]" if (kube_proxy_exclude_cidrs[0] | length) == 1 else "[" + kube_proxy_exclude_cidrs | join(",") + "]")) }}
minSyncPeriod: {{ kube_proxy_min_sync_period }} minSyncPeriod: {{ kube_proxy_min_sync_period }}
scheduler: {{ kube_proxy_scheduler }} scheduler: {{ kube_proxy_scheduler }}
syncPeriod: {{ kube_proxy_sync_period }} syncPeriod: {{ kube_proxy_sync_period }}

2
roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2
View file

@ -326,7 +326,7 @@ iptables:
minSyncPeriod: {{ kube_proxy_min_sync_period }} minSyncPeriod: {{ kube_proxy_min_sync_period }}
syncPeriod: {{ kube_proxy_sync_period }} syncPeriod: {{ kube_proxy_sync_period }}
ipvs: ipvs:
excludeCIDRs: {{ kube_proxy_exclude_cidrs }} excludeCIDRs: {{ "[]" if kube_proxy_exclude_cidrs is not defined or kube_proxy_exclude_cidrs == "null" or kube_proxy_exclude_cidrs | length == 0 else (kube_proxy_exclude_cidrs if kube_proxy_exclude_cidrs[0] == '[' else ("[" + kube_proxy_exclude_cidrs + "]" if (kube_proxy_exclude_cidrs[0] | length) == 1 else "[" + kube_proxy_exclude_cidrs | join(",") + "]")) }}
minSyncPeriod: {{ kube_proxy_min_sync_period }} minSyncPeriod: {{ kube_proxy_min_sync_period }}
scheduler: {{ kube_proxy_scheduler }} scheduler: {{ kube_proxy_scheduler }}
syncPeriod: {{ kube_proxy_sync_period }} syncPeriod: {{ kube_proxy_sync_period }}