Make kubectl binary configurable with the k3s_kubectl_binary parameter

Closes techno-tim/k3s-ansible#566

Signed-off-by: Christian Berendt <berendt@osism.tech>
This commit is contained in:
Christian Berendt
2024-08-20 09:21:25 +02:00
parent 3a0303d130
commit d67c69cbf5
6 changed files with 23 additions and 18 deletions

View File

@@ -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 }}"