feat: more changes to templating (#1218)

* feat: clean up more jinja default references Signed-off-by: Devin Buhl <devin@buhl.casa> * feat: add additional tls sans force kube-vip on k3s Signed-off-by: Devin Buhl <devin@buhl.casa> --------- Signed-off-by: Devin Buhl <devin@buhl.casa>
2024-01-21 11:39:12 -05:00
1 parent 8339d142b7
commit e1330d734c
@@ -41,7 +41,7 @@
        kubeconfig: /etc/rancher/k3s/k3s.yaml
        kind: "{{ item.kind }}"
        name: "{{ item.name }}"
-        namespace: "{{ item.namespace|default('') }}"
+        namespace: "{{ item.namespace | default('') }}"
        wait: true
        wait_sleep: 10
        wait_timeout: 360
@@ -16,7 +16,7 @@
      block:
        - name: Locale | Set timezone
          community.general.timezone:
-            name: "{{ timezone|default('Etc/UTC') }}"
+            name: "{{ timezone | default('Etc/UTC') }}"

    - name: Packages
      block:
@@ -62,7 +62,7 @@
              ff02::2 ip6-allrouters
            dest: /etc/hosts
            mode: preserve
-        #% if bootstrap_advanced_flags|default({}) and bootstrap_advanced_flags.update_resolv_conf|default(true) %#
+        #% if bootstrap_advanced_flags.update_resolv_conf %#
        # https://github.com/onedr0p/flux-cluster-template/discussions/635
        - name: Network Configuration | Remove immutable flag from /etc/resolv.conf
          ansible.builtin.file:
@@ -80,7 +80,7 @@
            dest: /etc/resolv.conf
            content: |
              search .
-              nameserver #{ bootstrap_dns_server|default('1.1.1.1', true) }#
+              nameserver #{ bootstrap_dns_server }#
        #% endif %#

    - name: System Configuration
@@ -1,4 +1,4 @@
-#% if bootstrap_distribution == 'k3s' and (bootstrap_nodes.master | length > 1 or bootstrap_kube_api_addr|default('')) %#
+#% if bootstrap_distribution == 'k3s' %#
 ---
 apiVersion: v1
 kind: Pod