External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-02-25 15:06:06 -03:30
Code Issues Packages Projects Releases Wiki Activity

Remove extra parameter kube_proxy_remove (#8158)

Browse Source 
Signed-off-by: EDGsheryl <edgsheryl@gmail.com>
This commit is contained in:
EDGsheryl
2021-11-15 16:02:48 +08:00
committed by GitHub
parent 027cbefb87
commit 4d79a55904
4 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
roles/kubernetes/preinstall/tasks/0020-verify-settings.yml
View File

@@ -56,16 +56,6 @@
- kube_network_plugin == 'calico'
- not ignore_assert_errors
- name: Stop if kube-proxy is enabled when using eBPF dataplane
assert:
that:
- kube_proxy_remove
msg: "kube-proxy needs to be disabled when using Calico with eBPF dataplane"
when:
- calico_bpf_enabled | default(false)
- kube_network_plugin == 'calico'
- not ignore_assert_errors
- name: Stop if unsupported version of Kubernetes
assert:
that: kube_version is version(kube_version_min_required, '>=')

2
roles/kubespray-defaults/defaults/main.yaml
View File

@@ -32,6 +32,8 @@ kubeadm_init_phases_skip: >-
{{ kubeadm_init_phases_skip_default }} + [ "addon/kube-proxy" ]
{%- elif kube_network_plugin == 'cilium' and (cilium_kube_proxy_replacement is defined and cilium_kube_proxy_replacement == 'strict') -%}
{{ kubeadm_init_phases_skip_default }} + [ "addon/kube-proxy" ]
{%- elif kube_network_plugin == 'calico' and (calico_bpf_enabled is defined and calico_bpf_enabled) -%}
{{ kubeadm_init_phases_skip_default }} + [ "addon/kube-proxy" ]
{%- elif kube_proxy_remove is defined and kube_proxy_remove -%}
{{ kubeadm_init_phases_skip_default }} + [ "addon/kube-proxy" ]
{%- else -%}