From 424145881c1c76cb4ebc659be39b59a469bc9ae3 Mon Sep 17 00:00:00 2001 From: Karsten Kosmala Date: Thu, 20 Jan 2022 11:13:32 +0100 Subject: [PATCH 1/3] use basename of url for items in k3s_server_manifests_urls and k3s_server_pod_manifests_urls if filename is not provided Signed-off-by: Karsten Kosmala --- README.md | 2 +- tasks/ensure_k3s_auto_deploy.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 9b1f828..41a5f2e 100644 --- a/README.md +++ b/README.md @@ -338,7 +338,7 @@ to `true`. #### Important note about `k3s_server_manifests_urls` and `k3s_server_pod_manifests_urls` To deploy server manifests and server pod manifests from URL, you need to -specify a `url` and a `filename`. Below is an example of how to deploy the +specify a `url` and optionally a `filename` (if none provided basename is used). Below is an example of how to deploy the Tigera operator for Calico and kube-vip. ```yaml diff --git a/tasks/ensure_k3s_auto_deploy.yml b/tasks/ensure_k3s_auto_deploy.yml index 842d8ce..4ba05f2 100644 --- a/tasks/ensure_k3s_auto_deploy.yml +++ b/tasks/ensure_k3s_auto_deploy.yml @@ -34,7 +34,7 @@ - name: Ensure auto-deploying manifests are downloaded to the primary controller ansible.builtin.get_url: url: "{{ item.url }}" - dest: "{{ k3s_server_manifests_dir }}/{{ item.filename }}" + dest: "{{ k3s_server_manifests_dir }}/{{ item.filename | default(item.url | basename }}" mode: 0644 loop: "{{ k3s_server_manifests_urls }}" become: "{{ k3s_become }}" @@ -55,7 +55,7 @@ - name: Ensure auto-deploying manifests are downloaded to the primary controller ansible.builtin.get_url: url: "{{ item.url }}" - dest: "{{ k3s_server_pod_manifests_dir }}/{{ item.filename }}" + dest: "{{ k3s_server_pod_manifests_dir }}/{{ item.filename | default(item.url | basename }}" mode: 0644 loop: "{{ k3s_server_pod_manifests_urls }}" become: "{{ k3s_become }}" From 80eca6003142246a7e73fceac548ef2c8ddce082 Mon Sep 17 00:00:00 2001 From: Karsten Kosmala Date: Sun, 30 Jan 2022 12:08:22 +0100 Subject: [PATCH 2/3] add missing bracket Co-authored-by: Xan Manning <244186+xanmanning@users.noreply.github.com> --- tasks/ensure_k3s_auto_deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/ensure_k3s_auto_deploy.yml b/tasks/ensure_k3s_auto_deploy.yml index 4ba05f2..2a23b94 100644 --- a/tasks/ensure_k3s_auto_deploy.yml +++ b/tasks/ensure_k3s_auto_deploy.yml @@ -34,7 +34,7 @@ - name: Ensure auto-deploying manifests are downloaded to the primary controller ansible.builtin.get_url: url: "{{ item.url }}" - dest: "{{ k3s_server_manifests_dir }}/{{ item.filename | default(item.url | basename }}" + dest: "{{ k3s_server_manifests_dir }}/{{ item.filename | default(item.url | basename) }}" mode: 0644 loop: "{{ k3s_server_manifests_urls }}" become: "{{ k3s_become }}" From 1475d1724df40939d6948abffa72806d3b4b7d1d Mon Sep 17 00:00:00 2001 From: Karsten Kosmala Date: Sun, 30 Jan 2022 12:08:34 +0100 Subject: [PATCH 3/3] add missing bracket Co-authored-by: Xan Manning <244186+xanmanning@users.noreply.github.com> --- tasks/ensure_k3s_auto_deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/ensure_k3s_auto_deploy.yml b/tasks/ensure_k3s_auto_deploy.yml index 2a23b94..32cfbac 100644 --- a/tasks/ensure_k3s_auto_deploy.yml +++ b/tasks/ensure_k3s_auto_deploy.yml @@ -55,7 +55,7 @@ - name: Ensure auto-deploying manifests are downloaded to the primary controller ansible.builtin.get_url: url: "{{ item.url }}" - dest: "{{ k3s_server_pod_manifests_dir }}/{{ item.filename | default(item.url | basename }}" + dest: "{{ k3s_server_pod_manifests_dir }}/{{ item.filename | default(item.url | basename) }}" mode: 0644 loop: "{{ k3s_server_pod_manifests_urls }}" become: "{{ k3s_become }}"