ansible-collections/kubernetes
2
0
Fork 0
Code Issues 8 Pull Requests 1 Actions Projects Releases 28 Wiki Activity

fix(k3s): use correct variables in conditional clauses

Browse Source 
!2
This commit is contained in:
Jon Lockwood
2023-10-29 17:10:10 +09:30
parent 8272b2507b
commit 9ac52ee165
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tasks/k3s.yaml
View File

@ -16,15 +16,17 @@
when: > when: >
install_kubernetes | default(true) | bool install_kubernetes | default(true) | bool
and and
not kubernetes_installed | default(false) | bool kubernetes_installed | default(false) | bool
- name: Wireguard Cluster Encryption - name: Wireguard Cluster Encryption
ansible.builtin.include_tasks: ansible.builtin.include_tasks:
file: k3s/configure.yaml file: k3s/wireguard.yaml
when: > when: >
install_kubernetes | default(true) | bool install_kubernetes | default(true) | bool
and and
not kubernetes_installed | default(false) | bool kubernetes_installed | default(false) | bool
and and
not kubernetes_installed_encryption | default(false) | bool not kubernetes_installed_encryption | default(false) | bool
and
kubernetes_config.cluster.networking.encrypt | default(false) | bool

8
tasks/k3s/wireguard.yaml
View File

@ -6,8 +6,8 @@
update_cache: false update_cache: false
when: > when: >
ansible_os_family == 'Debian' ansible_os_family == 'Debian'
and # and
kubernetes.networking.encrypt | default(false) | bool # kubernetes.networking.encrypt | default(false) | bool
- name: Enable Cluster Encryption - name: Enable Cluster Encryption
@ -15,10 +15,6 @@
cmd: kubectl patch felixconfiguration default --type='merge' -p '{"spec":{"wireguardEnabled":true,"wireguardEnabledV6":true}}' cmd: kubectl patch felixconfiguration default --type='merge' -p '{"spec":{"wireguardEnabled":true,"wireguardEnabledV6":true}}'
changed_when: false changed_when: false
when: > when: >
ansible_os_family == 'Debian'
and
kubernetes.networking.encrypt | default(false) | bool
and
kubernetes_config.cluster.prime.name == inventory_hostname kubernetes_config.cluster.prime.name == inventory_hostname
- name: Set Kubernetes Encryption Final Install Fact - name: Set Kubernetes Encryption Final Install Fact