Rolle aktualisiert: k3s (#455)

Co-authored-by: Michael Grote <michael.grote@posteo.de>
Reviewed-on: #455

playbooks/3_service/k3s.yml

@@ -1,7 +1,7 @@
 ---
 - hosts: k3s
   roles:
-    - { role: xanmanning.k3s, tags: "k3s" }
+    - { role: PyratLabs.k3s, tags: "k3s" }
     - { role: mgrote.k8s_autocompletion, tags: "autocomp" }
     - { role: pandemonium1986.ansible-role-k9s, tags: "k9s", become: true }
     - { role: mgrote.fluxcd, tags: "flux", become: true }

roles/PyratLabs.k3s/.github/workflows/ci.yml

@@ -46,7 +46,7 @@ jobs:
           - distro: xanmanning/docker-alpine-ansible:3.16
             scenario: highavailabilityetcd
             prebuilt: 'false'
-          - distro: geerlingguy/docker-rockylinux8-ansible:latest
+          - distro: geerlingguy/docker-rockylinux9-ansible:latest
             scenario: highavailabilityetcd
             prebuilt: 'true'
 

roles/PyratLabs.k3s/CHANGELOG.md

@@ -14,6 +14,21 @@
 ---
 -->
 
+## 2022-11-15, v3.3.1
+
+### Notable changes
+
+  - fix: length indentation in registry.yaml
+
+---
+
+## 2022-09-11, v3.3.0
+
+### Notable changes
+
+  - fix: `no_log` removed from `ansible.builtin.uri` tasks
+  - feat: `k3s_skip_post_checks` option added
+
 ---
 
 ## 2022-06-17, v3.2.0

roles/PyratLabs.k3s/molecule/debug/converge.yml

@@ -4,8 +4,8 @@
   become: true
   vars:
     pyratlabs_issue_controller_dump: true
-    k3s_agent:
-      snapshotter: native
+    # k3s_agent:
+    #   snapshotter: native
   pre_tasks:
     - name: Ensure k3s_debug is set
       ansible.builtin.set_fact:

roles/PyratLabs.k3s/molecule/default/converge.yml

@@ -8,5 +8,5 @@
         molecule_is_test: true
         k3s_install_hard_links: true
         k3s_release_version: stable
-        k3s_agent:
-          snapshotter: native
+        # k3s_agent:
+          # snapshotter: native

roles/PyratLabs.k3s/molecule/highavailabilitydb/converge.yml

@@ -9,8 +9,8 @@
     k3s_control_token: 55ba04e5-e17d-4535-9170-3e4245453f4d
     k3s_server:
       datastore-endpoint: "postgres://postgres:verybadpass@database:5432/postgres?sslmode=disable"
-    k3s_agent:
-      snapshotter: native
+    # k3s_agent:
+    #   snapshotter: native
     k3s_service_env_file: /tmp/k3s.env
   pre_tasks:
     - name: Set each node to be a control node

roles/PyratLabs.k3s/molecule/highavailabilityetcd/converge.yml

@@ -5,6 +5,7 @@
   become: true
   vars:
     molecule_is_test: true
+    k3s_release_version: "v1.21"
     k3s_use_experimental: true
     k3s_etcd_datastore: true
     k3s_server:
@@ -12,8 +13,9 @@
     k3s_agent:
       node-ip: "{{ ansible_default_ipv4.address }}"
       snapshotter: native
+      selinux: "{{ ansible_os_family | lower == 'redhat' }}"
     k3s_skip_validation: "{{ k3s_service_handler[ansible_service_mgr] == 'service' }}"
-    k3s_skip_post_checks: "{{ ansible_os_family | lower == 'redhat' }}"
+    # k3s_skip_post_checks: "{{ ansible_os_family | lower == 'redhat' }}"
   pre_tasks:
     - name: Set each node to be a control node
       ansible.builtin.set_fact:

roles/PyratLabs.k3s/molecule/nodeploy/k3s_agent.yml

@@ -6,4 +6,4 @@ node-label:
 kubelet-arg:
   - "cloud-provider=external"
   - "provider-id=azure"
-snapshotter: native
+# snapshotter: native

roles/PyratLabs.k3s/tasks/post_checks_nodes.yml

@@ -12,7 +12,7 @@
     - kubectl_get_nodes_result.rc == 0
     - kubectl_get_nodes_result.stdout.find("NotReady") == -1
   retries: 30
-  delay: 20
+  delay: 5
   when:
     - k3s_control_node
     - ("flannel-backend" not in k3s_runtime_config