From c08ec68bc5bad25a26600ff84f30e1e876b83d7b Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Mon, 29 May 2023 10:08:06 +0800 Subject: [PATCH] roles/k3s: update --- .../{setup.sh => setup-k3s-with-custom-cni.sh} | 0 ...up-k3s-with-hostpath-sc.sh => setup-k3s.sh} | 0 playbook/roles/k3s/tasks/main.yml | 18 +++++++++--------- 3 files changed, 9 insertions(+), 9 deletions(-) rename playbook/roles/k3s/files/{setup.sh => setup-k3s-with-custom-cni.sh} (100%) rename playbook/roles/k3s/files/{setup-k3s-with-hostpath-sc.sh => setup-k3s.sh} (100%) diff --git a/playbook/roles/k3s/files/setup.sh b/playbook/roles/k3s/files/setup-k3s-with-custom-cni.sh similarity index 100% rename from playbook/roles/k3s/files/setup.sh rename to playbook/roles/k3s/files/setup-k3s-with-custom-cni.sh diff --git a/playbook/roles/k3s/files/setup-k3s-with-hostpath-sc.sh b/playbook/roles/k3s/files/setup-k3s.sh similarity index 100% rename from playbook/roles/k3s/files/setup-k3s-with-hostpath-sc.sh rename to playbook/roles/k3s/files/setup-k3s.sh diff --git a/playbook/roles/k3s/tasks/main.yml b/playbook/roles/k3s/tasks/main.yml index 9f4d531b..39c7b84c 100755 --- a/playbook/roles/k3s/tasks/main.yml +++ b/playbook/roles/k3s/tasks/main.yml @@ -1,15 +1,15 @@ - name: Setup K3S Server - script: files/setup.sh + script: files/setup-k3s.sh when: inventory_hostname in groups[group] -- name: Sync K3S CNI Config - template: src=templates/cni_install.sh dest=/tmp/ owner=root group=root mode=0644 - when: inventory_hostname in groups[group] - -- name: Setup K3S CNI - shell: 'bash /tmp/cni_install.sh' - when: inventory_hostname in groups[group] - ignore_errors: yes +#- name: Sync K3S CNI Config +# template: src=templates/cni_install.sh dest=/tmp/ owner=root group=root mode=0644 +# when: inventory_hostname in groups[group] +# +#- name: Setup K3S CNI +# shell: 'bash /tmp/cni_install.sh' +# when: inventory_hostname in groups[group] +# ignore_errors: yes - name: Setup K3S Ingress script: files/setup-ingress-apisix-controller.sh {{ ingress_ip }}