Skip to content
Snippets Groups Projects
Unverified Commit abfa1636 authored by Arthur Outhenin-Chalandre's avatar Arthur Outhenin-Chalandre Committed by GitHub
Browse files

Fix kube-proxy post deployment removal (#5554)


* Fix kube-proxy removal

* Fix unwanted skipped task for kube-proxy
* Fix kube_proxy_remove default

Signed-off-by: default avatarArthur Outhenin-Chalandre <arthur@cri.epita.fr>

* Add test for kube-router svc proxy

Signed-off-by: default avatarArthur Outhenin-Chalandre <arthur@cri.epita.fr>
parent deca5ec9
No related branches found
No related tags found
No related merge requests found
...@@ -63,6 +63,11 @@ packet_ubuntu16-kube-router-sep: ...@@ -63,6 +63,11 @@ packet_ubuntu16-kube-router-sep:
extends: .packet extends: .packet
when: manual when: manual
packet_ubuntu16-kube-router-svc-proxy:
stage: deploy-part2
extends: .packet
when: manual
packet_debian10-containerd: packet_debian10-containerd:
stage: deploy-part2 stage: deploy-part2
extends: .packet extends: .packet
......
...@@ -4,9 +4,6 @@ ...@@ -4,9 +4,6 @@
discovery_timeout: 60s discovery_timeout: 60s
kubeadm_join_timeout: 120s kubeadm_join_timeout: 120s
# Optionally remove kube_proxy installed by kubeadm
kube_proxy_remove: false
# If non-empty, will use this string as identification instead of the actual hostname # If non-empty, will use this string as identification instead of the actual hostname
kube_override_hostname: >- kube_override_hostname: >-
{%- if cloud_provider is defined and cloud_provider in [ 'aws' ] -%} {%- if cloud_provider is defined and cloud_provider in [ 'aws' ] -%}
......
...@@ -163,7 +163,6 @@ ...@@ -163,7 +163,6 @@
delegate_to: "{{ groups['kube-master']|first }}" delegate_to: "{{ groups['kube-master']|first }}"
when: when:
- kube_proxy_remove - kube_proxy_remove
- kubeadm_discovery_address != kube_apiserver_endpoint | replace("https://", "")
# When scaling/adding nodes in the existing k8s cluster, kube-proxy wouldn't be created, as `kubeadm init` wouldn't run. # When scaling/adding nodes in the existing k8s cluster, kube-proxy wouldn't be created, as `kubeadm init` wouldn't run.
ignore_errors: true ignore_errors: true
tags: tags:
......
...@@ -22,9 +22,6 @@ kubelet_kubelet_cgroups: "/systemd/system.slice" ...@@ -22,9 +22,6 @@ kubelet_kubelet_cgroups: "/systemd/system.slice"
### fail with swap on (default true) ### fail with swap on (default true)
kubelet_fail_swap_on: true kubelet_fail_swap_on: true
# Optionally remove kube_proxy installed by kubeadm
kube_proxy_remove: false
# Reserve this space for kube resources # Reserve this space for kube resources
kube_memory_reserved: 256M kube_memory_reserved: 256M
kube_cpu_reserved: 100m kube_cpu_reserved: 100m
......
--- ---
kubernetes_user_manifests_path: "{{ ansible_env.HOME }}/kube-manifests" kubernetes_user_manifests_path: "{{ ansible_env.HOME }}/kube-manifests"
# Optionally remove kube_proxy installed by kubeadm
kube_proxy_remove: false
# nodeselector for kube-proxy ds is beta until 1.18 # nodeselector for kube-proxy ds is beta until 1.18
kube_proxy_nodeselector: "{{ 'kubernetes.io/os' if kube_version is version('v1.18.0', '>=') else 'beta.kubernetes.io/os' }}" kube_proxy_nodeselector: "{{ 'kubernetes.io/os' if kube_version is version('v1.18.0', '>=') else 'beta.kubernetes.io/os' }}"
---
# Instance settings
cloud_image: ubuntu-1604
mode: separate
# Kubespray settings
bootstrap_os: ubuntu
kube_network_plugin: kube-router
deploy_netchecker: true
dns_min_replicas: 1
kube_router_run_service_proxy: true
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment