Upstream/ansible-role-k3s
1
0
Fork 0
mirror of https://github.com/PyratLabs/ansible-role-k3s.git synced 2024-10-31 08:28:54 +01:00
Code Issues Projects Releases Wiki Activity

Bugfix: minimum version for secrets encryption reverted

Browse Source
This commit is contained in:
Xan Manning 2020-05-17 20:43:39 +01:00
parent b42ffade29
commit 02e12e61a8
5 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
molecule/highavailability/playbook-dqlite.yml
View File

@ -4,6 +4,7 @@
become: true become: true
vars: vars:
molecule_is_test: true molecule_is_test: true
k3s_release_version: v1.18.2+k3s1
k3s_dqlite_datastore: true k3s_dqlite_datastore: true
k3s_secrets_encryption: true k3s_secrets_encryption: true
k3s_use_experimental: true k3s_use_experimental: true

2
tasks/main.yml
View File

@ -8,4 +8,4 @@
success_msg: "k3s_cluster_state is valid." success_msg: "k3s_cluster_state is valid."
when: k3s_cluster_state is defined when: k3s_cluster_state is defined
- import_tasks: state-{{ (k3s_cluster_state | lower) | default('installed') }}.yml - include_tasks: state-{{ (k3s_cluster_state | lower) | default('installed') }}.yml

2
tasks/state-installed.yml
View File

@ -1,5 +1,7 @@
--- ---
- import_tasks: validate/check-environment.yml
- import_tasks: build/preconfigure-k3s.yml - import_tasks: build/preconfigure-k3s.yml
- import_tasks: build/get-version.yml - import_tasks: build/get-version.yml

6
tasks/validate/check-environment.yml Normal file
View File

@ -0,0 +1,6 @@
---
- name: Check to see if jmespath is installed
command: echo "{{ (hostvars | json_query('*.k3s_control_node')) }}"
register: k3s_check_jmespath
changed_when: false

4
tasks/validate/check-variables.yml
View File

@ -137,7 +137,7 @@
- name: Check k3s_flannel_backend 'host-gw' configuration against k3s version - name: Check k3s_flannel_backend 'host-gw' configuration against k3s version
assert: assert:
that: that:
- (k3s_release_version | replace('v', '')) is version_compare('1.16.9', '>=') - (k3s_release_version | replace('v', '')) is version_compare('1.17.2', '>=')
success_msg: "host-gw flannel backend supported in {{ k3s_release_version }}" success_msg: "host-gw flannel backend supported in {{ k3s_release_version }}"
fail_msg: "host-gw flannel backend is not supported in {{ k3s_release_version }}" fail_msg: "host-gw flannel backend is not supported in {{ k3s_release_version }}"
when: k3s_flannel_backend is defined and k3s_flannel_backend == 'host-gw' when: k3s_flannel_backend is defined and k3s_flannel_backend == 'host-gw'
@ -217,7 +217,7 @@
- name: Check k3s_secrets_encryption against k3s version - name: Check k3s_secrets_encryption against k3s version
assert: assert:
that: that:
- (k3s_release_version | replace('v', '')) is version_compare('1.16.9', '>=') - (k3s_release_version | replace('v', '')) is version_compare('1.17.4', '>=')
success_msg: "Secrets encryption at rest supported in {{ k3s_release_version }}" success_msg: "Secrets encryption at rest supported in {{ k3s_release_version }}"
fail_msg: "Secrets encryption at rest is not supported in {{ k3s_release_version }}" fail_msg: "Secrets encryption at rest is not supported in {{ k3s_release_version }}"
when: k3s_secrets_encryption is defined and k3s_secrets_encryption when: k3s_secrets_encryption is defined and k3s_secrets_encryption