From 447b7e863a0903424d2565295d49838f5ff450f2 Mon Sep 17 00:00:00 2001 From: JesusMtnez Date: Fri, 22 Dec 2023 06:11:14 +0100 Subject: [PATCH] fix(ansible): prefix variables with role name --- ansible/roles/k3s/tasks/agents.yml | 2 +- ansible/roles/k3s/tasks/servers.yml | 2 +- ansible/roles/k3s/vars/main.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ansible/roles/k3s/tasks/agents.yml b/ansible/roles/k3s/tasks/agents.yml index 1bf02f1..b7efbbf 100644 --- a/ansible/roles/k3s/tasks/agents.yml +++ b/ansible/roles/k3s/tasks/agents.yml @@ -13,6 +13,6 @@ - --k3s-version - "{{ k3s_version }}" - --k3s-extra-args - - "{{ common_extra_args }}" + - "{{ k3s_common_extra_args }}" with_items: "{{ groups['agents'] }}" when: k3s_server_created is succeeded diff --git a/ansible/roles/k3s/tasks/servers.yml b/ansible/roles/k3s/tasks/servers.yml index 229257c..0f0076c 100644 --- a/ansible/roles/k3s/tasks/servers.yml +++ b/ansible/roles/k3s/tasks/servers.yml @@ -18,7 +18,7 @@ - --k3s-version - "{{ k3s_version }}" - --k3s-extra-args - - "{{ servers_extra_args }} {{ common_extra_args }}" + - "{{ k3s_servers_extra_args }} {{ k3s_common_extra_args }}" - --local-path - "{{ k3s_repo_abs_path.stdout }}/kubeconfig" with_items: "{{ groups['servers'] }}" diff --git a/ansible/roles/k3s/vars/main.yml b/ansible/roles/k3s/vars/main.yml index 9a6b822..c41540a 100644 --- a/ansible/roles/k3s/vars/main.yml +++ b/ansible/roles/k3s/vars/main.yml @@ -1,5 +1,5 @@ --- # renovate: datasource=github-releases depName=k3s-io/k3s k3s_version: "v1.29.0+k3s1" -common_extra_args: "--prefer-bundled-bin" -servers_extra_args: "--write-kubeconfig-mode=0644 --disable-helm-controller --disable=traefik --disable=servicelb" +k3s_common_extra_args: "--prefer-bundled-bin" +k3s_servers_extra_args: "--write-kubeconfig-mode=0644 --disable-helm-controller --disable=traefik --disable=servicelb"