Remove extra parameter kube_proxy_remove (#8158)
Signed-off-by: EDGsheryl <edgsheryl@gmail.com>
This commit is contained in:
parent
027cbefb87
commit
4d79a55904
4 changed files with 2 additions and 12 deletions
|
@ -295,7 +295,6 @@ To enable the eBPF dataplane support ensure you add the following to your invent
|
||||||
|
|
||||||
```yaml
|
```yaml
|
||||||
calico_bpf_enabled: true
|
calico_bpf_enabled: true
|
||||||
kube_proxy_remove: true
|
|
||||||
```
|
```
|
||||||
|
|
||||||
**NOTE:** there is known incompatibility in using the `kernel-kvm` kernel package on Ubuntu OSes because it is missing support for `CONFIG_NET_SCHED` which is a requirement for Calico eBPF support. When using Calico eBPF with Ubuntu ensure you run the `-generic` kernel.
|
**NOTE:** there is known incompatibility in using the `kernel-kvm` kernel package on Ubuntu OSes because it is missing support for `CONFIG_NET_SCHED` which is a requirement for Calico eBPF support. When using Calico eBPF with Ubuntu ensure you run the `-generic` kernel.
|
||||||
|
|
|
@ -56,16 +56,6 @@
|
||||||
- kube_network_plugin == 'calico'
|
- kube_network_plugin == 'calico'
|
||||||
- not ignore_assert_errors
|
- 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
|
- name: Stop if unsupported version of Kubernetes
|
||||||
assert:
|
assert:
|
||||||
that: kube_version is version(kube_version_min_required, '>=')
|
that: kube_version is version(kube_version_min_required, '>=')
|
||||||
|
|
|
@ -32,6 +32,8 @@ kubeadm_init_phases_skip: >-
|
||||||
{{ kubeadm_init_phases_skip_default }} + [ "addon/kube-proxy" ]
|
{{ 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') -%}
|
{%- 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" ]
|
{{ 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 -%}
|
{%- elif kube_proxy_remove is defined and kube_proxy_remove -%}
|
||||||
{{ kubeadm_init_phases_skip_default }} + [ "addon/kube-proxy" ]
|
{{ kubeadm_init_phases_skip_default }} + [ "addon/kube-proxy" ]
|
||||||
{%- else -%}
|
{%- else -%}
|
||||||
|
|
|
@ -9,7 +9,6 @@ kube_network_plugin: calico
|
||||||
deploy_netchecker: true
|
deploy_netchecker: true
|
||||||
|
|
||||||
calico_bpf_enabled: true
|
calico_bpf_enabled: true
|
||||||
kube_proxy_remove: true
|
|
||||||
loadbalancer_apiserver_localhost: true
|
loadbalancer_apiserver_localhost: true
|
||||||
use_localhost_as_kubeapi_loadbalancer: true
|
use_localhost_as_kubeapi_loadbalancer: true
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue