build: bump version 1.8.0 -> 1.8.1-a1

!64

.cz.yaml

@@ -4,5 +4,5 @@ commitizen:
   prerelease_offset: 1
   tag_format: $version
   update_changelog_on_bump: false
-  version: 1.7.1
+  version: 1.8.1-a1
   version_scheme: semver

.gitlab/integration_test.gitlab-ci.yml

@@ -191,23 +191,27 @@ test_results:
   rules:
 
     - if: $CI_COMMIT_TAG
+      allow_failure: true
       when: on_success
 
-    - if: "$CI_COMMIT_AUTHOR =='nfc_bot <helpdesk@nofusscomputing.com>'"
-      when: never
+    # Needs to run, even by bot as the test results need to be available
+    # - if: "$CI_COMMIT_AUTHOR =='nfc_bot <helpdesk@nofusscomputing.com>'"
+    #   when: never
 
     - if: # Occur on merge
-        $CI_COMMIT_BRANCH == "development"
+        $CI_COMMIT_BRANCH
           &&
         $CI_PIPELINE_SOURCE == "push"
-      when: always
+      allow_failure: true
+      when: on_success
 
-    - if:
-        $CI_COMMIT_BRANCH != "development"
-          &&
-        $CI_COMMIT_BRANCH != "master"
-          &&
-        $CI_PIPELINE_SOURCE == "push"
-      when: always
+    # - if:
+    #     $CI_COMMIT_BRANCH != "development"
+    #       &&
+    #     $CI_COMMIT_BRANCH != "master"
+    #       &&
+    #     $CI_PIPELINE_SOURCE == "push"
+    #   allow_failure: true
+    #   when: always
 
     - when: never

CHANGELOG.md

@@ -1,3 +1,21 @@
+## 1.8.1-a1 (2024-05-02)
+
+### Fix
+
+- **nfc_kubernetes**: correct url build to loop through all cpu arch
+
+## 1.8.0 (2024-05-02)
+
+### Feat
+
+- **nfc_kubernetes**: build url and on use cast as string
+
+## 1.7.2 (2024-04-25)
+
+### Fix
+
+- **nfc_kubernetes**: adjust some tasks to run during checkmode
+
 ## 1.7.1 (2024-04-24)
 
 ### Fix
@@ -50,10 +68,6 @@
 
 ## 1.3.0 (2024-03-18)
 
-### Feat
-
-- dont attempt to install if already installed
-
 ### Fix
 
 - **handler**: add missing 'reboot_host' handler
@@ -69,23 +83,3 @@
 ### Fix
 
 - **config**: use correct var name when setting node name
-
-## 1.1.2 (2024-03-13)
-
-### Fix
-
-- **readme**: update gitlab links to new loc
-- **configure**: dont attempt to configure firewall if install=false
-- **handler**: remove old k8s code causing handler to fail
-
-## 1.1.1 (2024-03-13)
-
-### Fix
-
-- don't check hostname for localhost
-
-## 1.1.0 (2024-03-13)
-
-### Feat
-
-- add role readme and fix gitlab release job

galaxy.yml

@@ -8,7 +8,7 @@ namespace: nofusscomputing
 name: kubernetes
 
 # The version of the collection. Must be compatible with semantic versioning
-version: 1.7.1
+version: 1.8.1-a1
 
 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection
 readme: README.md

roles/nfc_kubernetes/tasks/helm/main.yaml

@@ -5,6 +5,7 @@
     url: https://baltocdn.com/helm/signing.asc
     dest: /usr/share/keyrings/helm.asc
     mode: 740
+  changed_when: not ansible_check_mode
   delay: 10
   retries: 3
 

roles/nfc_kubernetes/tasks/install.yaml

@@ -4,6 +4,7 @@
   ansible.builtin.command:
     cmd: hostname
   changed_when: false
+  check_mode: false
   register: hostname_to_check
   tags:
     - always
@@ -18,8 +19,6 @@
     - always
   when: >
     inventory_hostname != 'localhost'
-      and
-    not ansible_check_mode
 
 
 - name: Testing Env Variables
@@ -27,6 +26,7 @@
     ansible_default_ipv4: {
       "address": "127.0.0.1"
     }
+  check_mode: false
   tags:
     - always
   when: >

roles/nfc_kubernetes/tasks/k3s/install.yaml

@@ -274,6 +274,7 @@
 
     executable: /bin/bash
   changed_when: false
+  check_mode: false
   failed_when: false
   register: k3s_metadata
 
@@ -303,29 +304,49 @@
   when: >
     file_cached_k3s_binary.stat.checksum | default('0') != node_k3s.desired_hash
 
+  # Workaround. See: https://github.com/ansible/awx/issues/15161
+- name: Build K3s Download URL
+  ansible.builtin.set_fact:
+    cacheable: false
+    url_download_k3s: |-
+      [
+        {%- for key, value in nfc_kubernetes_install_architectures | dict2items -%}
+        "https://github.com/k3s-io/k3s/releases/download/
+          {{- node_k3s.desired_version | urlencode -}}
+        /k3s
+        {%- if key == 'aarch64' -%}
+        -arm64
+        {%- endif %}",
+        {%- endfor -%}
+      ]
+  changed_when: false
+  check_mode: false
+  delegate_to: localhost
+  loop: "{{ nfc_kubernetes_install_architectures | dict2items }}"
+  loop_control:
+    loop_var: cpu_arch
+  vars:
+    ansible_connection: local
+
 
 - name: Download K3s Binary
   ansible.builtin.uri:
-    url: |-
-      https://github.com/k3s-io/k3s/releases/download/
-        {{- node_k3s.desired_version | urlencode -}}
-      /k3s
-      {%- if cpu_arch.key == 'aarch64' -%}
-      -arm64
-      {%- endif %}
+    url: "{{ url | string }}"
     method: GET
     return_content: false
     status_code:
       - 200
       - 304
-    dest: "/tmp/k3s.{{ cpu_arch.key }}"
+    dest: "/tmp/k3s.{{ ansible_architecture }}"
     mode: "744"
+  changed_when: not ansible_check_mode
+  check_mode: false
   delay: 10
   retries: 3
   register: k3s_download_files
   delegate_to: localhost
   failed_when: >
-    (lookup('ansible.builtin.file', '/tmp/k3s.' + cpu_arch.key) | hash('sha256') | string) != node_k3s.desired_hash
+    (lookup('ansible.builtin.file', '/tmp/k3s.' + ansible_architecture) | hash('sha256') | string) != node_k3s.desired_hash
       and
     (
       k3s_download_files.status | int != 200
@@ -334,9 +355,9 @@
     )
   run_once: true
   when: ansible_os_family == 'Debian'
-  loop: "{{ nfc_kubernetes_install_architectures | dict2items }}"
+  loop: "{{ url_download_k3s }}"
   loop_control:
-    loop_var: cpu_arch
+    loop_var: url
   vars:
     ansible_connection: local
 
@@ -395,6 +416,7 @@
       - 304
     dest: "{{ item.dest }}"
     mode: "744"
+  check_mode: false
   changed_when: false
   delay: 10
   retries: 3
@@ -600,6 +622,8 @@
   failed_when: kubernetes_ready_check.rc != 0
   when: >
     not nfc_role_kubernetes_cluster_upgraded | default(false) | bool
+      and
+    not ansible_check_mode
 
 
 - name: Config Link

roles/nfc_kubernetes/tasks/k3s/migrate_to_operator.yaml

@@ -110,6 +110,7 @@
         owner: root
         group: 'root'
       changed_when: false
+      check_mode: false
       become: true
       delegate_to: localhost
       loop: "{{ nfc_kubernetes_install_architectures | dict2items }}"