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

Fix kube-proxy ds win nodeselector check for 1.17 (#5982)

Browse source 
* Fix kube-proxy ds nodeselector for older versions

* Fix for ansible-lint
This commit is contained in:
Lovro Seder 2020-04-20 17:43:39 +02:00 committed by GitHub
parent 6e29a47784
commit 536606c2ed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
roles/win_nodes/kubernetes_patch/defaults/main.yml
View file

@ -3,3 +3,5 @@
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 # Optionally remove kube_proxy installed by kubeadm
kube_proxy_remove: false kube_proxy_remove: false
# 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' }}"

1
roles/win_nodes/kubernetes_patch/files/nodeselector-os-linux-patch.json
View file

@ -1 +0,0 @@
{"spec":{"template":{"spec":{"nodeSelector":{"kubernetes.io/os":"linux"}}}}}

11
roles/win_nodes/kubernetes_patch/tasks/main.yml
View file

@ -9,17 +9,12 @@
- name: Apply kube-proxy nodeselector - name: Apply kube-proxy nodeselector
block: block:
- name: Copy kube-proxy daemonset nodeselector patch
copy:
src: nodeselector-os-linux-patch.json
dest: "{{ kubernetes_user_manifests_path }}/nodeselector-os-linux-patch.json"
# Due to https://github.com/kubernetes/kubernetes/issues/58212 we cannot rely on exit code for "kubectl patch" # Due to https://github.com/kubernetes/kubernetes/issues/58212 we cannot rely on exit code for "kubectl patch"
- name: Check current nodeselector for kube-proxy daemonset - name: Check current nodeselector for kube-proxy daemonset
command: >- command: >-
{{ bin_dir }}/kubectl --kubeconfig {{ kube_config_dir }}/admin.conf {{ bin_dir }}/kubectl --kubeconfig {{ kube_config_dir }}/admin.conf
get ds kube-proxy --namespace=kube-system get ds kube-proxy --namespace=kube-system
-o jsonpath='{.spec.template.spec.nodeSelector.kubernetes\.io/os}' -o jsonpath='{.spec.template.spec.nodeSelector.{{ kube_proxy_nodeselector | regex_replace('\.', '\\.') }}}'
register: current_kube_proxy_state register: current_kube_proxy_state
retries: 60 retries: 60
delay: 5 delay: 5
@ -30,9 +25,7 @@
shell: >- shell: >-
{{ bin_dir }}/kubectl --kubeconfig {{ kube_config_dir }}/admin.conf {{ bin_dir }}/kubectl --kubeconfig {{ kube_config_dir }}/admin.conf
patch ds kube-proxy --namespace=kube-system --type=strategic -p patch ds kube-proxy --namespace=kube-system --type=strategic -p
"$(cat nodeselector-os-linux-patch.json)" '{"spec":{"template":{"spec":{"nodeSelector":{"{{ kube_proxy_nodeselector }}":"linux"} }}}}'
args:
chdir: "{{ kubernetes_user_manifests_path }}"
register: patch_kube_proxy_state register: patch_kube_proxy_state
when: current_kube_proxy_state.stdout | trim | lower != "linux" when: current_kube_proxy_state.stdout | trim | lower != "linux"