use the env var that is still supported.

This commit is contained in:
MichaelMcCulloch 2024-03-10 16:01:11 -06:00
parent dc299f2173
commit 64c1fb61dd

View File

@ -1,5 +1,4 @@
--- ---
# ---- DEPRECATED ---------------- # ---- DEPRECATED ----------------
# #
# Most of the kubernetes_kubelet_extra_args are deprecated. See https://kubernetes.io/docs/reference/command-line-tools-reference/kubelet for details. # Most of the kubernetes_kubelet_extra_args are deprecated. See https://kubernetes.io/docs/reference/command-line-tools-reference/kubelet for details.
@ -7,28 +6,28 @@
- name: Check for existence of kubelet environment file. (deprecated) - name: Check for existence of kubelet environment file. (deprecated)
stat: stat:
path: '{{ kubelet_environment_file_path }}' path: "{{ kubelet_environment_file_path }}"
register: kubelet_environment_file register: kubelet_environment_file
- name: Set facts for KUBELET_EXTRA_ARGS task if environment file exists. (deprecated) - name: Set facts for KUBELET_ARGS task if environment file exists. (deprecated)
set_fact: set_fact:
kubelet_args_path: '{{ kubelet_environment_file_path }}' kubelet_args_path: "{{ kubelet_environment_file_path }}"
kubelet_args_line: "{{ 'KUBELET_EXTRA_ARGS=' + kubernetes_kubelet_extra_args }}" kubelet_args_line: "{{ 'KUBELET_ARGS=' + kubernetes_kubelet_extra_args }}"
kubelet_args_regexp: '^KUBELET_EXTRA_ARGS=' kubelet_args_regexp: "^KUBELET_ARGS="
when: kubelet_environment_file.stat.exists when: kubelet_environment_file.stat.exists
- name: Set facts for KUBELET_EXTRA_ARGS task if environment file doesn't exist. (deprecated) - name: Set facts for KUBELET_ARGS task if environment file doesn't exist. (deprecated)
set_fact: set_fact:
kubelet_args_path: '/etc/systemd/system/kubelet.service.d/10-kubeadm.conf' kubelet_args_path: "/etc/systemd/system/kubelet.service.d/10-kubeadm.conf"
kubelet_args_line: "{{ 'Environment=\"KUBELET_EXTRA_ARGS=' + kubernetes_kubelet_extra_args + '\"' }}" kubelet_args_line: '{{ ''Environment="KUBELET_ARGS='' + kubernetes_kubelet_extra_args + ''"'' }}'
kubelet_args_regexp: '^Environment="KUBELET_EXTRA_ARGS=' kubelet_args_regexp: '^Environment="KUBELET_ARGS='
when: not kubelet_environment_file.stat.exists when: not kubelet_environment_file.stat.exists
- name: Configure KUBELET_EXTRA_ARGS. (deprecated) - name: Configure KUBELET_ARGS. (deprecated)
lineinfile: lineinfile:
path: '{{ kubelet_args_path }}' path: "{{ kubelet_args_path }}"
line: '{{ kubelet_args_line }}' line: "{{ kubelet_args_line }}"
regexp: '{{ kubelet_args_regexp }}' regexp: "{{ kubelet_args_regexp }}"
state: present state: present
mode: 0644 mode: 0644
register: kubelet_extra_args register: kubelet_extra_args