From a5e1e6f8b0382406b701e29ad0f55781573cbdf9 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Mon, 19 Aug 2024 16:06:03 +0200 Subject: [PATCH] refctor: rework ci to ue ansible-lint and fix molecule --- .later.yml | 18 ----------------- .woodpecker/docs.yaml | 10 +++++----- .woodpecker/lint.yaml | 6 +++--- .woodpecker/test.yaml | 2 +- .yamllint | 20 +++++++++++++++++++ handlers/main.yml | 8 ++++---- molecule/default/molecule.yml | 6 +++--- molecule/requirements.yml => requirements.yml | 4 +++- tasks/init.yml | 5 +++-- tasks/main.yml | 15 +++++++++----- 10 files changed, 52 insertions(+), 42 deletions(-) delete mode 100644 .later.yml create mode 100644 .yamllint rename molecule/requirements.yml => requirements.yml (60%) diff --git a/.later.yml b/.later.yml deleted file mode 100644 index 45f5d4e..0000000 --- a/.later.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- -ansible: - custom_modules: - - iptables_raw - - openssl_pkcs12 - - proxmox_kvm - - ucr - - corenetworks_dns - - corenetworks_token - -rules: - exclude_files: - - "LICENSE*" - - "**/*.md" - - "**/*.ini" - - warning_filter: - - ANS126 diff --git a/.woodpecker/docs.yaml b/.woodpecker/docs.yaml index f053ca8..857444b 100644 --- a/.woodpecker/docs.yaml +++ b/.woodpecker/docs.yaml @@ -9,11 +9,11 @@ steps: - name: generate image: quay.io/thegeeklab/ansible-doctor environment: - ANSIBLE_DOCTOR_EXCLUDE_FILES: molecule/ - ANSIBLE_DOCTOR_FORCE_OVERWRITE: "true" - ANSIBLE_DOCTOR_LOG_LEVEL: INFO - ANSIBLE_DOCTOR_ROLE_NAME: ${CI_REPO_NAME} - ANSIBLE_DOCTOR_TEMPLATE: readme + ANSIBLE_DOCTOR_EXCLUDE_FILES: "['molecule/']" + ANSIBLE_DOCTOR_RENDERER__FORCE_OVERWRITE: "true" + ANSIBLE_DOCTOR_LOGGING__LEVEL: info + ANSIBLE_DOCTOR_ROLE__NAME: ${CI_REPO_NAME} + ANSIBLE_DOCTOR_TEMPLATE__NAME: readme - name: format image: quay.io/thegeeklab/alpine-tools diff --git a/.woodpecker/lint.yaml b/.woodpecker/lint.yaml index 36b1ec8..c48a8e4 100644 --- a/.woodpecker/lint.yaml +++ b/.woodpecker/lint.yaml @@ -6,10 +6,10 @@ when: - ${CI_REPO_DEFAULT_BRANCH} steps: - - name: ansible-later - image: quay.io/thegeeklab/ansible-later:4 + - name: ansible-lint + image: quay.io/thegeeklab/ansible-dev-tools:1 commands: - - ansible-later + - ansible-lint environment: FORCE_COLOR: "1" diff --git a/.woodpecker/test.yaml b/.woodpecker/test.yaml index 256ad91..661dc8b 100644 --- a/.woodpecker/test.yaml +++ b/.woodpecker/test.yaml @@ -7,7 +7,7 @@ when: variables: - &molecule_base - image: quay.io/thegeeklab/molecule:6 + image: quay.io/thegeeklab/ansible-dev-tools:1 group: molecule environment: PY_COLORS: "1" diff --git a/.yamllint b/.yamllint new file mode 100644 index 0000000..df1d39e --- /dev/null +++ b/.yamllint @@ -0,0 +1,20 @@ +--- +extends: default + +rules: + truthy: + allowed-values: ["True", "False"] + comments: + min-spaces-from-content: 1 + comments-indentation: False + line-length: disable + braces: + min-spaces-inside: 0 + max-spaces-inside: 1 + brackets: + min-spaces-inside: 0 + max-spaces-inside: 0 + indentation: enable + octal-values: + forbid-implicit-octal: True + forbid-explicit-octal: True diff --git a/handlers/main.yml b/handlers/main.yml index f48d8f7..818be98 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -3,14 +3,14 @@ ansible.builtin.service: name: k3s state: restarted - daemon_reload: yes - enabled: yes + daemon_reload: True + enabled: True listen: __k3s_restart - name: Restart iscsid service ansible.builtin.service: name: iscsid state: restarted - daemon_reload: yes - enabled: yes + daemon_reload: True + enabled: True listen: __iscsid_restart diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 78072ce..d10e02c 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -4,11 +4,11 @@ driver: dependency: name: galaxy options: - role-file: molecule/requirements.yml - requirements-file: molecule/requirements.yml + role-file: requirements.yml + requirements-file: requirements.yml platforms: - name: "rocky9-k3s" - server_type: "CX22" + server_type: "cx22" image: "rocky-9" provisioner: name: ansible diff --git a/molecule/requirements.yml b/requirements.yml similarity index 60% rename from molecule/requirements.yml rename to requirements.yml index c21f294..1d3c924 100644 --- a/molecule/requirements.yml +++ b/requirements.yml @@ -1,5 +1,7 @@ --- -collections: [] +collections: + - name: ansible.posix + - name: kubernetes.core roles: - src: https://gitea.rknet.org/ansible/xoxys.kernel diff --git a/tasks/init.yml b/tasks/init.yml index 066ee61..ce254f0 100644 --- a/tasks/init.yml +++ b/tasks/init.yml @@ -6,7 +6,7 @@ failed_when: False - name: Clean previous runs of k3s-init - ansible.builtin.command: systemctl reset-failed k3s-init + ansible.builtin.command: systemctl reset-failed k3s-init # noqa command-instead-of-module failed_when: False changed_when: False tags: @@ -23,7 +23,8 @@ creates: "{{ __k3s_service_file }}" register: __k3s_init -- when: __k3s_init.changed | bool +- name: Wait for k3s-init to finish + when: __k3s_init.changed | bool # noqa no-handler block: - name: Verify that all nodes actually joined ansible.builtin.command: >- diff --git a/tasks/main.yml b/tasks/main.yml index df07821..eb3e7f8 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,9 +1,14 @@ --- -- ansible.builtin.include_tasks: reset.yml +- name: Reset k3s + ansible.builtin.include_tasks: reset.yml when: k3s_reset | bool -- ansible.builtin.include_tasks: prepare.yml -- ansible.builtin.include_tasks: init.yml +- name: Prepare k3s + ansible.builtin.include_tasks: prepare.yml +- name: Initialize cluster + ansible.builtin.include_tasks: init.yml when: k3s_server | bool -- ansible.builtin.include_tasks: setup.yml -- ansible.builtin.include_tasks: iscsi.yml +- name: Setup k3s + ansible.builtin.include_tasks: setup.yml +- name: Setup iscsi + ansible.builtin.include_tasks: iscsi.yml when: k3s_iscsi_enabled | bool