Typo bugfixes

CHANGELOG.md

@@ -14,6 +14,13 @@
 ---
 -->
 
+## 2021-02-27, v2.6.1
+
+### Notable changes
+
+  - Bugfix: Templating error for single control plane nodes using Etcd.
+  - Bugfix: a number of typos fixed.
+
 ## 2021-02-16, v2.6.0
 
 ### Notable changes

tasks/build/configure-k3s-cluster.yml

@@ -1,6 +1,6 @@
 ---
 
-- name: Ensure cluster token is captured from control node
+- name: "Ensure cluster token is captured from {{ k3s_control_delegate }}"
   ansible.builtin.slurp:
     path: "{{ k3s_runtime_config['data-dir'] | default(k3s_data_dir) }}/server/token"
   register: k3s_slurped_cluster_token

tasks/build/install-k3s.yml

@@ -16,7 +16,7 @@
 - include_tasks: install-k3s-node.yml
   when: k3s_build_cluster
 
-- name: Ensure k3s control plane is started
+- name: Ensure k3s initial control plane server is started
   ansible.builtin.systemd:
     name: k3s
     state: started

tasks/build/preconfigure-k3s-auto-deploying-manifests.yml

@@ -9,7 +9,7 @@
   become: "{{ k3s_become_for_directory_creation | ternary(true, false, k3s_become_for_all) }}"
 
 # https://rancher.com/docs/k3s/latest/en/advanced/#auto-deploying-manifests
-- name: Ensure Auto-Deploying Manifests are copied to controllers
+- name: Ensure auto-deploying manifests are copied to controllers
   ansible.builtin.template:
     src: "{{ item }}"
     dest: "{{ k3s_server_manifests_dir }}/{{ item | basename | replace('.j2','') }}"

tasks/build/preconfigure-k3s.yml

@@ -17,7 +17,7 @@
     k3s_primary_control_node: "{{ 'false' if k3s_build_cluster else 'true' }}"
   when: k3s_primary_control_node is not defined
 
-- name: Ensure k3s control plane port is captures
+- name: Ensure k3s control plane port is captured
   ansible.builtin.set_fact:
     k3s_control_plane_port: "{{ k3s_runtime_config['https-listen-port'] | default(6443) }}"
   delegate_to: k3s_primary_control_node

tasks/validate/state/control-plane.yml

@@ -1,6 +1,6 @@
 ---
 
-- name: Check that the control plane to is available to accept connections
+- name: Check that the control plane is available to accept connections
   ansible.builtin.wait_for:
     port: "{{ k3s_runtime_config['https-listen-port'] | default('6443') }}"
     host: "{{ k3s_runtime_config['bind-address'] | default('127.0.0.1') }}"

templates/k3s.service.j2

@@ -28,7 +28,7 @@ ExecStart={{ k3s_install_dir }}/k3s
 {% endif %}
 {% if k3s_control_node %}
     server
-    {% if (k3s_etcd_datastore is defined and k3s_etcd_datastore) and (k3s_primary_control_node is not defined or not k3s_primary_control_node) %}
+    {% if (k3s_etcd_datastore is defined and k3s_etcd_datastore) and (k3s_primary_control_node is not defined or not k3s_primary_control_node) and k3s_controller_list | length > 1 %}
         --server https://{{ k3s_control_node_address }}:{{ k3s_control_plane_port | default(6443) }}
         --token-file {{ k3s_token_location }}
     {% endif %}