Resolve ansible-lint name errors (#10253)

* project: fix ansible-lint name

Signed-off-by: Arthur Outhenin-Chalandre <arthur.outhenin-chalandre@proton.ch>

* project: ignore jinja template error in names

Signed-off-by: Arthur Outhenin-Chalandre <arthur.outhenin-chalandre@proton.ch>

* project: capitalize ansible name

Signed-off-by: Arthur Outhenin-Chalandre <arthur.outhenin-chalandre@proton.ch>

* project: update notify after name capitalization

Signed-off-by: Arthur Outhenin-Chalandre <arthur.outhenin-chalandre@proton.ch>

---------

Signed-off-by: Arthur Outhenin-Chalandre <arthur.outhenin-chalandre@proton.ch>

roles/etcd/handlers/main.yml

@@ -1,39 +1,40 @@
 ---
-- name: restart etcd
+- name: Restart etcd
   command: /bin/true
   notify:
     - Backup etcd data
-    - etcd | reload systemd
-    - reload etcd
-    - wait for etcd up
+    - Etcd | reload systemd
+    - Reload etcd
+    - Wait for etcd up
     - Cleanup etcd backups
 
-- name: restart etcd-events
+- name: Restart etcd-events
   command: /bin/true
   notify:
-    - etcd | reload systemd
-    - reload etcd-events
-    - wait for etcd-events up
+    - Etcd | reload systemd
+    - Reload etcd-events
+    - Wait for etcd-events up
 
-- import_tasks: backup.yml
+- name: Backup etcd
+  import_tasks: backup.yml
 
-- name: etcd | reload systemd
+- name: Etcd | reload systemd
   systemd:
     daemon_reload: true
 
-- name: reload etcd
+- name: Reload etcd
   service:
     name: etcd
     state: restarted
   when: is_etcd_master
 
-- name: reload etcd-events
+- name: Reload etcd-events
   service:
     name: etcd-events
     state: restarted
   when: is_etcd_master
 
-- name: wait for etcd up
+- name: Wait for etcd up
   uri:
     url: "https://{% if is_etcd_master %}{{ etcd_address }}{% else %}127.0.0.1{% endif %}:2379/health"
     validate_certs: no
@@ -44,9 +45,10 @@
   retries: 60
   delay: 1
 
-- import_tasks: backup_cleanup.yml
+- name: Cleanup etcd backups
+  import_tasks: backup_cleanup.yml
 
-- name: wait for etcd-events up
+- name: Wait for etcd-events up
   uri:
     url: "https://{% if is_etcd_master %}{{ etcd_address }}{% else %}127.0.0.1{% endif %}:2383/health"
     validate_certs: no
@@ -57,6 +59,6 @@
   retries: 60
   delay: 1
 
-- name: set etcd_secret_changed
+- name: Set etcd_secret_changed
   set_fact:
     etcd_secret_changed: true

roles/etcd/tasks/configure.yml

@@ -41,7 +41,8 @@
     ETCDCTL_CACERT: "{{ etcd_cert_dir }}/ca.pem"
     ETCDCTL_ENDPOINTS: "{{ etcd_events_access_addresses }}"
 
-- include_tasks: refresh_config.yml
+- name: Configure | Refresh etcd config
+  include_tasks: refresh_config.yml
   when: is_etcd_master
 
 - name: Configure | Copy etcd.service systemd file

roles/etcd/tasks/gen_certs_script.yml

@@ -56,7 +56,7 @@
   run_once: yes
   delegate_to: "{{ groups['etcd'][0] }}"
   when: gen_certs | default(false)
-  notify: set etcd_secret_changed
+  notify: Set etcd_secret_changed
 
 - name: Gen_certs | run cert generation script for all clients
   command: "bash -x {{ etcd_script_dir }}/make-ssl-etcd.sh -f {{ etcd_config_dir }}/openssl.conf -d {{ etcd_cert_dir }}"
@@ -73,7 +73,7 @@
     - kube_network_plugin in ["calico", "flannel", "cilium"] or cilium_deploy_additionally | default(false) | bool
     - kube_network_plugin != "calico" or calico_datastore == "etcd"
     - gen_certs | default(false)
-  notify: set etcd_secret_changed
+  notify: Set etcd_secret_changed
 
 - name: Gen_certs | Gather etcd member/admin and kube_control_plane client certs from first etcd node
   slurp:
@@ -97,7 +97,7 @@
     - inventory_hostname in groups['etcd']
     - sync_certs | default(false)
     - inventory_hostname != groups['etcd'][0]
-  notify: set etcd_secret_changed
+  notify: Set etcd_secret_changed
 
 - name: Gen_certs | Write etcd member/admin and kube_control_plane client certs to other etcd nodes
   copy:
@@ -129,7 +129,7 @@
     - inventory_hostname != groups['etcd'][0]
     - kube_network_plugin in ["calico", "flannel", "cilium"] or cilium_deploy_additionally | default(false) | bool
     - kube_network_plugin != "calico" or calico_datastore == "etcd"
-  notify: set etcd_secret_changed
+  notify: Set etcd_secret_changed
 
 - name: Gen_certs | Write node certs to other etcd nodes
   copy:
@@ -147,12 +147,14 @@
   loop_control:
     label: "{{ item.item }}"
 
-- include_tasks: gen_nodes_certs_script.yml
+- name: Gen_certs | Generate etcd certs
+  include_tasks: gen_nodes_certs_script.yml
   when:
     - inventory_hostname in groups['kube_control_plane'] and
         sync_certs | default(false) and inventory_hostname not in groups['etcd']
 
-- include_tasks: gen_nodes_certs_script.yml
+- name: Gen_certs | Generate etcd certs on nodes if needed
+  include_tasks: gen_nodes_certs_script.yml
   when:
     - kube_network_plugin in ["calico", "flannel", "cilium"] or cilium_deploy_additionally | default(false) | bool
     - kube_network_plugin != "calico" or calico_datastore == "etcd"

roles/etcd/tasks/install_docker.yml

@@ -1,5 +1,7 @@
 ---
-- import_tasks: install_etcdctl_docker.yml
+
+- name: Install etcdctl from docker
+  import_tasks: install_etcdctl_docker.yml
   when: etcd_cluster_setup
 
 - name: Get currently-deployed etcd version
@@ -14,14 +16,14 @@
 
 - name: Restart etcd if necessary
   command: /bin/true
-  notify: restart etcd
+  notify: Restart etcd
   when:
     - etcd_cluster_setup
     - etcd_image_tag not in etcd_current_docker_image.stdout | default('')
 
 - name: Restart etcd-events if necessary
   command: /bin/true
-  notify: restart etcd-events
+  notify: Restart etcd-events
   when:
     - etcd_events_cluster_setup
     - etcd_image_tag not in etcd_events_current_docker_image.stdout | default('')

roles/etcd/tasks/install_host.yml

@@ -8,19 +8,19 @@
 
 - name: Restart etcd if necessary
   command: /bin/true
-  notify: restart etcd
+  notify: Restart etcd
   when:
     - etcd_cluster_setup
     - etcd_version.lstrip('v') not in etcd_current_host_version.stdout | default('')
 
 - name: Restart etcd-events if necessary
   command: /bin/true
-  notify: restart etcd-events
+  notify: Restart etcd-events
   when:
     - etcd_events_cluster_setup
     - etcd_version.lstrip('v') not in etcd_current_host_version.stdout | default('')
 
-- name: install | Download etcd and etcdctl
+- name: Install | Download etcd and etcdctl
   include_tasks: "../../download/tasks/download_file.yml"
   vars:
     download: "{{ download_defaults | combine(downloads.etcd) }}"
@@ -29,7 +29,7 @@
     - never
     - etcd
 
-- name: install | Copy etcd and etcdctl binary from download dir
+- name: Install | Copy etcd and etcdctl binary from download dir
   copy:
     src: "{{ local_release_dir }}/etcd-{{ etcd_version }}-linux-{{ host_architecture }}/{{ item }}"
     dest: "{{ bin_dir }}/{{ item }}"

roles/etcd/tasks/join_etcd-events_member.yml

@@ -12,7 +12,8 @@
     ETCDCTL_CACERT: "{{ etcd_cert_dir }}/ca.pem"
     ETCDCTL_ENDPOINTS: "{{ etcd_events_access_addresses }}"
 
-- include_tasks: refresh_config.yml
+- name: Join Member | Refresh etcd config
+  include_tasks: refresh_config.yml
   vars:
     # noqa: jinja[spacing]
     etcd_events_peer_addresses: >-

roles/etcd/tasks/join_etcd_member.yml

@@ -13,7 +13,8 @@
     ETCDCTL_CACERT: "{{ etcd_cert_dir }}/ca.pem"
     ETCDCTL_ENDPOINTS: "{{ etcd_access_addresses }}"
 
-- include_tasks: refresh_config.yml
+- name: Join Member | Refresh etcd config
+  include_tasks: refresh_config.yml
   vars:
     # noqa: jinja[spacing]
     etcd_peer_addresses: >-

roles/etcd/tasks/main.yml

@@ -1,23 +1,27 @@
 ---
-- include_tasks: check_certs.yml
+- name: Check etcd certs
+  include_tasks: check_certs.yml
   when: cert_management == "script"
   tags:
     - etcd-secrets
     - facts
 
-- include_tasks: "gen_certs_script.yml"
+- name: Generate etcd certs
+  include_tasks: "gen_certs_script.yml"
   when:
     - cert_management | d('script') == "script"
   tags:
     - etcd-secrets
 
-- include_tasks: upd_ca_trust.yml
+- name: Trust etcd CA
+  include_tasks: upd_ca_trust.yml
   when:
     - inventory_hostname in groups['etcd'] | union(groups['kube_control_plane']) | unique | sort
   tags:
     - etcd-secrets
 
-- include_tasks: upd_ca_trust.yml
+- name: Trust etcd CA on nodes if needed
+  include_tasks: upd_ca_trust.yml
   when:
     - kube_network_plugin in ["calico", "flannel", "cilium"] or cilium_deploy_additionally | default(false) | bool
     - kube_network_plugin != "calico" or calico_datastore == "etcd"
@@ -49,29 +53,33 @@
     - master
     - network
 
-- include_tasks: "install_{{ etcd_deployment_type }}.yml"
+- name: Install etcd
+  include_tasks: "install_{{ etcd_deployment_type }}.yml"
   when: is_etcd_master
   tags:
     - upgrade
 
-- include_tasks: configure.yml
+- name: Configure etcd
+  include_tasks: configure.yml
   when: is_etcd_master
 
-- include_tasks: refresh_config.yml
+- name: Refresh etcd config
+  include_tasks: refresh_config.yml
   when: is_etcd_master
 
 - name: Restart etcd if certs changed
   command: /bin/true
-  notify: restart etcd
+  notify: Restart etcd
   when: is_etcd_master and etcd_cluster_setup and etcd_secret_changed | default(false)
 
 - name: Restart etcd-events if certs changed
   command: /bin/true
-  notify: restart etcd
+  notify: Restart etcd
   when: is_etcd_master and etcd_events_cluster_setup and etcd_secret_changed | default(false)
 
 # After etcd cluster is assembled, make sure that
 # initial state of the cluster is in `existing`
 # state instead of `new`.
-- include_tasks: refresh_config.yml
+- name: Refresh etcd config again for idempotency
+  include_tasks: refresh_config.yml
   when: is_etcd_master

roles/etcd/tasks/refresh_config.yml

@@ -4,7 +4,7 @@
     src: etcd.env.j2
     dest: /etc/etcd.env
     mode: 0640
-  notify: restart etcd
+  notify: Restart etcd
   when: is_etcd_master and etcd_cluster_setup
 
 - name: Refresh config | Create etcd-events config file
@@ -12,5 +12,5 @@
     src: etcd-events.env.j2
     dest: /etc/etcd-events.env
     mode: 0640
-  notify: restart etcd-events
+  notify: Restart etcd-events
   when: is_etcd_master and etcd_events_cluster_setup