Merge pull request #193 from PyratLabs/fix/ensure-release-check-can-b…

…e-debugged

fix(version): ensure log output provided when version lookup fails

.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'
 

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:

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

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

molecule/highavailabilityetcd/converge.yml

@@ -5,15 +5,17 @@
   become: true
   vars:
     molecule_is_test: true
+    k3s_release_version: "v1.21"
     k3s_use_experimental: true
     k3s_etcd_datastore: true
     k3s_server:
       secrets-encryption: true
     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:

molecule/nodeploy/k3s_agent.yml

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

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

tasks/pre_checks_version.yml

@@ -13,13 +13,12 @@
     k3s_release_channel: "{{ k3s_release_version | default('stable') }}"
   check_mode: false
 
-- name: Get the latest release version from k3s.io
+- name: "Get the latest release version from {{ k3s_api_releases }}"
   ansible.builtin.uri:
     url: "{{ k3s_api_releases }}"
     return_content: true
     body_format: json
   register: k3s_latest_release
-  no_log: true
   check_mode: false
 
 - name: Ensure the release version is set as a fact

templates/k3s.service.j2

@@ -26,6 +26,7 @@ Environment={{ env_var }}="{{ k3s_service_env_vars[env_var] }}"
 {% if k3s_service_env_file is defined and k3s_service_env_file %}
 EnvironmentFile={{ k3s_service_env_file }}
 {% endif %}
+ExecStartPre=/bin/sh -xc '! /usr/bin/systemctl is-enabled --quiet nm-cloud-setup.service'
 ExecStartPre=-/sbin/modprobe br_netfilter
 ExecStartPre=-/sbin/modprobe overlay
 {% filter regex_replace('\s+', ' ') %}