Make kubectl binary configurable with the k3s_kubectl_binary parameter

Closes #566

Signed-off-by: Christian Berendt <[email protected]>

roles/k3s_server/defaults/main.yml

@@ -1,6 +1,8 @@
 ---
 extra_server_args: ""
 
+k3s_kubectl_binary: k3s kubectl
+
 group_name_master: master
 
 kube_vip_arp: true

roles/k3s_server/tasks/main.yml

@@ -44,7 +44,7 @@
  block:
  - name: Verify that all nodes actually joined (check k3s-init.service if this fails)
  ansible.builtin.command:
- cmd: k3s kubectl get nodes -l "node-role.kubernetes.io/master=true" -o=jsonpath="{.items[*].metadata.name}"
+ cmd: "{{ k3s_kubectl_binary }} get nodes -l 'node-role.kubernetes.io/master=true' -o=jsonpath='{.items[*].metadata.name}'"
  register: nodes
  until: nodes.rc == 0 and (nodes.stdout.split() | length) == (groups[group_name_master | default('master')] | length) # yamllint disable-line rule:line-length
  retries: "{{ retry_count | default(20) }}"
@@ -124,7 +124,7 @@
 
 - name: Configure kubectl cluster to {{ endpoint_url }}
  ansible.builtin.command: >-
- k3s kubectl config set-cluster default
+ {{ k3s_kubectl_binary }} config set-cluster default
  --server={{ endpoint_url }}
  --kubeconfig {{ ansible_user_dir }}/.kube/config
  changed_when: true

roles/k3s_server_post/defaults/main.yml

@@ -1,4 +1,6 @@
 ---
+k3s_kubectl_binary: k3s kubectl
+
 bpf_lb_algorithm: maglev
 bpf_lb_mode: hybrid
 

roles/k3s_server_post/tasks/calico.yml

@@ -45,7 +45,7 @@
 
  - name: Wait for Tigera Operator resources
  ansible.builtin.command: >-
- k3s kubectl wait {{ item.type }}/{{ item.name }}
+ {{ k3s_kubectl_binary }} wait {{ item.type }}/{{ item.name }}
  --namespace='tigera-operator'
  --for=condition=Available=True
  --timeout=30s
@@ -78,12 +78,12 @@
  - name: Wait for Calico system resources to be available
  ansible.builtin.command: >-
  {% if item.type == 'daemonset' %}
- k3s kubectl wait pods
+ {{ k3s_kubectl_binary }} wait pods
  --namespace='{{ item.namespace }}'
  --selector={{ item.selector }}
  --for=condition=Ready
  {% else %}
- k3s kubectl wait {{ item.type }}/{{ item.name }}
+ {{ k3s_kubectl_binary }} wait {{ item.type }}/{{ item.name }}
  --namespace='{{ item.namespace }}'
  --for=condition=Available
  {% endif %}

roles/k3s_server_post/tasks/cilium.yml

@@ -116,7 +116,8 @@
  when: ping_result.rc != 0
 
  - name: Test for existing Cilium install
- ansible.builtin.command: k3s kubectl -n kube-system get daemonsets cilium
+ ansible.builtin.command: |
+ {{ k3s_kubectl_binary }} -n kube-system get daemonsets cilium
  register: cilium_installed
  failed_when: false
  changed_when: false
@@ -192,12 +193,12 @@
  - name: Wait for Cilium resources
  ansible.builtin.command: >-
  {% if item.type == 'daemonset' %}
- k3s kubectl wait pods
+ {{ k3s_kubectl_binary }} wait pods
  --namespace=kube-system
  --selector='k8s-app=cilium'
  --for=condition=Ready
  {% else %}
- k3s kubectl wait {{ item.type }}/{{ item.name }}
+ {{ k3s_kubectl_binary }} wait {{ item.type }}/{{ item.name }}
  --namespace=kube-system
  --for=condition=Available
  {% endif %}
@@ -244,8 +245,8 @@
  - name: Test for BGP config resources
  ansible.builtin.command: "{{ item }}"
  loop:
- - k3s kubectl get CiliumBGPPeeringPolicy.cilium.io
- - k3s kubectl get CiliumLoadBalancerIPPool.cilium.io
+ - {{ k3s_kubectl_binary }} get CiliumBGPPeeringPolicy.cilium.io
+ - {{ k3s_kubectl_binary }} get CiliumLoadBalancerIPPool.cilium.io
  changed_when: false
  loop_control:
  label: "{{ item }}"

roles/k3s_server_post/tasks/metallb.yml

@@ -12,14 +12,14 @@
  ansible.builtin.shell: |-
  set -o pipefail
 
- REPLICAS=$(k3s kubectl --namespace='metallb-system' get replicasets \
+ REPLICAS=$({{ k3s_kubectl_binary }} --namespace='metallb-system' get replicasets \
  -l 'component=controller,app=metallb' \
  -o jsonpath='{.items[0].spec.template.spec.containers[0].image}, {.items[0].metadata.name}' 2>/dev/null || true)
  REPLICAS_SETS=$(echo ${REPLICAS} | grep -v '{{ metal_lb_controller_tag_version }}' | sed -e "s/^.*\s//g")
  if [ -n "${REPLICAS_SETS}" ] ; then
  for REPLICAS in "${REPLICAS_SETS}"
  do
- k3s kubectl --namespace='metallb-system' \
+ {{ k3s_kubectl_binary }} --namespace='metallb-system' \
  delete rs "${REPLICAS}"
  done
  fi
@@ -40,14 +40,14 @@
 
 - name: Test metallb-system namespace
  ansible.builtin.command: >-
- k3s kubectl -n metallb-system
+ {{ k3s_kubectl_binary }} -n metallb-system
  changed_when: false
  with_items: "{{ groups[group_name_master | default('master')] }}"
  run_once: true
 
 - name: Wait for MetalLB resources
  ansible.builtin.command: >-
- k3s kubectl wait {{ item.resource }}
+ {{ k3s_kubectl_binary }} wait {{ item.resource }}
  --namespace='metallb-system'
  {% if item.name | default(False) -%}{{ item.name }}{%- endif %}
  {% if item.selector | default(False) -%}--selector='{{ item.selector }}'{%- endif %}
@@ -99,14 +99,14 @@
 
 - name: Test metallb-system webhook-service endpoint
  ansible.builtin.command: >-
- k3s kubectl -n metallb-system get endpoints {{ metallb_webhook_service_name }}
+ {{ k3s_kubectl_binary }} -n metallb-system get endpoints {{ metallb_webhook_service_name }}
  changed_when: false
  with_items: "{{ groups[group_name_master | default('master')] }}"
  run_once: true
 
 - name: Apply metallb CRs
  ansible.builtin.command: >-
- k3s kubectl apply -f /tmp/k3s/metallb-crs.yaml
+ {{ k3s_kubectl_binary }} apply -f /tmp/k3s/metallb-crs.yaml
  --timeout='{{ metal_lb_available_timeout }}'
  register: this
  changed_when: false
@@ -116,7 +116,7 @@
 
 - name: Test metallb-system resources for Layer 2 configuration
  ansible.builtin.command: >-
- k3s kubectl -n metallb-system get {{ item }}
+ {{ k3s_kubectl_binary }} -n metallb-system get {{ item }}
  changed_when: false
  run_once: true
  when: metal_lb_mode == "layer2"
@@ -126,7 +126,7 @@
 
 - name: Test metallb-system resources for BGP configuration
  ansible.builtin.command: >-
- k3s kubectl -n metallb-system get {{ item }}
+ {{ k3s_kubectl_binary }} -n metallb-system get {{ item }}
  changed_when: false
  run_once: true
  when: metal_lb_mode == "bgp"