feat: set lstrip on ansible template task and remove comments (#1155)

* feat: set lstrip on ansible template task and remove comments

Signed-off-by: Devin Buhl <devin@buhl.casa>

* fix: cert-manager block was neing stripped

Signed-off-by: Devin Buhl <devin@buhl.casa>

---------

Signed-off-by: Devin Buhl <devin@buhl.casa>

bootstrap/tasks/addons/coredns.yaml

@@ -20,21 +20,20 @@
     src: "{{ item.src }}"
     dest: "{{ repository_path }}/kubernetes/apps/{{ addon_namespace }}/{{ addon_name }}/{{ item.path | replace('.j2', '') }}"
     mode: "0644"
+    lstrip_blocks: true
   with_community.general.filetree: ["../templates/addons/{{ addon_name }}/"]
   loop_control:
     label: "{{ item.path }}"
 
-- name: Template encrypted files for {{ addon_namespace }}/{{ addon_name }}
-  block:
-    - name: Template encrypted files
-      when: item.state == 'file' and 'sops' in item.path
-      community.sops.sops_encrypt:
-        path: "{{ repository_path }}/kubernetes/apps/{{ addon_namespace }}/{{ addon_name }}/{{ item.path | replace('.j2', '') }}"
-        encrypted_regex: ^(data|stringData)$
-        age: ["{{ bootstrap_age_public_key }}"]
-        content_yaml: "{{ lookup('ansible.builtin.template', item.src) | from_yaml }}"
-        mode: "0644"
-        force: true
-      with_community.general.filetree: ["../templates/addons/{{ addon_name }}/"]
-      loop_control:
-        label: "{{ item.path }}"
+- name: Template encrypted files
+  when: item.state == 'file' and 'sops' in item.path
+  community.sops.sops_encrypt:
+    path: "{{ repository_path }}/kubernetes/apps/{{ addon_namespace }}/{{ addon_name }}/{{ item.path | replace('.j2', '') }}"
+    encrypted_regex: ^(data|stringData)$
+    age: ["{{ bootstrap_age_public_key }}"]
+    content_yaml: "{{ lookup('ansible.builtin.template', item.src, lstrip_blocks=true) | from_yaml }}"
+    mode: "0644"
+    force: true
+  with_community.general.filetree: ["../templates/addons/{{ addon_name }}/"]
+  loop_control:
+    label: "{{ item.path }}"

bootstrap/tasks/addons/csi_driver_nfs.yaml

@@ -20,21 +20,20 @@
     src: "{{ item.src }}"
     dest: "{{ repository_path }}/kubernetes/apps/{{ addon_namespace }}/{{ addon_name }}/{{ item.path | replace('.j2', '') }}"
     mode: "0644"
+    lstrip_blocks: true
   with_community.general.filetree: ["../templates/addons/{{ addon_name }}/"]
   loop_control:
     label: "{{ item.path }}"
 
-- name: Template encrypted files for {{ addon_namespace }}/{{ addon_name }}
-  block:
-    - name: Template encrypted files
-      when: item.state == 'file' and 'sops' in item.path
-      community.sops.sops_encrypt:
-        path: "{{ repository_path }}/kubernetes/apps/{{ addon_namespace }}/{{ addon_name }}/{{ item.path | replace('.j2', '') }}"
-        encrypted_regex: ^(data|stringData)$
-        age: ["{{ bootstrap_age_public_key }}"]
-        content_yaml: "{{ lookup('ansible.builtin.template', item.src) | from_yaml }}"
-        mode: "0644"
-        force: true
-      with_community.general.filetree: ["../templates/addons/{{ addon_name }}/"]
-      loop_control:
-        label: "{{ item.path }}"
+- name: Template encrypted files
+  when: item.state == 'file' and 'sops' in item.path
+  community.sops.sops_encrypt:
+    path: "{{ repository_path }}/kubernetes/apps/{{ addon_namespace }}/{{ addon_name }}/{{ item.path | replace('.j2', '') }}"
+    encrypted_regex: ^(data|stringData)$
+    age: ["{{ bootstrap_age_public_key }}"]
+    content_yaml: "{{ lookup('ansible.builtin.template', item.src, lstrip_blocks=true) | from_yaml }}"
+    mode: "0644"
+    force: true
+  with_community.general.filetree: ["../templates/addons/{{ addon_name }}/"]
+  loop_control:
+    label: "{{ item.path }}"

bootstrap/tasks/addons/discord_template_notifier.yaml

@@ -20,21 +20,20 @@
     src: "{{ item.src }}"
     dest: "{{ repository_path }}/kubernetes/apps/{{ addon_namespace }}/{{ addon_name }}/{{ item.path | replace('.j2', '') }}"
     mode: "0644"
+    lstrip_blocks: true
   with_community.general.filetree: ["../templates/addons/{{ addon_name }}/"]
   loop_control:
     label: "{{ item.path }}"
 
-- name: Template encrypted files for {{ addon_namespace }}/{{ addon_name }}
-  block:
-    - name: Template encrypted files
-      when: item.state == 'file' and 'sops' in item.path
-      community.sops.sops_encrypt:
-        path: "{{ repository_path }}/kubernetes/apps/{{ addon_namespace }}/{{ addon_name }}/{{ item.path | replace('.j2', '') }}"
-        encrypted_regex: ^(data|stringData)$
-        age: ["{{ bootstrap_age_public_key }}"]
-        content_yaml: "{{ lookup('ansible.builtin.template', item.src) | from_yaml }}"
-        mode: "0644"
-        force: true
-      with_community.general.filetree: ["../templates/addons/{{ addon_name }}/"]
-      loop_control:
-        label: "{{ item.path }}"
+- name: Template encrypted files
+  when: item.state == 'file' and 'sops' in item.path
+  community.sops.sops_encrypt:
+    path: "{{ repository_path }}/kubernetes/apps/{{ addon_namespace }}/{{ addon_name }}/{{ item.path | replace('.j2', '') }}"
+    encrypted_regex: ^(data|stringData)$
+    age: ["{{ bootstrap_age_public_key }}"]
+    content_yaml: "{{ lookup('ansible.builtin.template', item.src, lstrip_blocks=true) | from_yaml }}"
+    mode: "0644"
+    force: true
+  with_community.general.filetree: ["../templates/addons/{{ addon_name }}/"]
+  loop_control:
+    label: "{{ item.path }}"

bootstrap/tasks/addons/grafana.yaml

@@ -20,21 +20,20 @@
     src: "{{ item.src }}"
     dest: "{{ repository_path }}/kubernetes/apps/{{ addon_namespace }}/{{ addon_name }}/{{ item.path | replace('.j2', '') }}"
     mode: "0644"
+    lstrip_blocks: true
   with_community.general.filetree: ["../templates/addons/{{ addon_name }}/"]
   loop_control:
     label: "{{ item.path }}"
 
-- name: Template encrypted files for {{ addon_namespace }}/{{ addon_name }}
-  block:
-    - name: Template encrypted files
-      when: item.state == 'file' and 'sops' in item.path
-      community.sops.sops_encrypt:
-        path: "{{ repository_path }}/kubernetes/apps/{{ addon_namespace }}/{{ addon_name }}/{{ item.path | replace('.j2', '') }}"
-        encrypted_regex: ^(data|stringData)$
-        age: ["{{ bootstrap_age_public_key }}"]
-        content_yaml: "{{ lookup('ansible.builtin.template', item.src) | from_yaml }}"
-        mode: "0644"
-        force: true
-      with_community.general.filetree: ["../templates/addons/{{ addon_name }}/"]
-      loop_control:
-        label: "{{ item.path }}"
+- name: Template encrypted files
+  when: item.state == 'file' and 'sops' in item.path
+  community.sops.sops_encrypt:
+    path: "{{ repository_path }}/kubernetes/apps/{{ addon_namespace }}/{{ addon_name }}/{{ item.path | replace('.j2', '') }}"
+    encrypted_regex: ^(data|stringData)$
+    age: ["{{ bootstrap_age_public_key }}"]
+    content_yaml: "{{ lookup('ansible.builtin.template', item.src, lstrip_blocks=true) | from_yaml }}"
+    mode: "0644"
+    force: true
+  with_community.general.filetree: ["../templates/addons/{{ addon_name }}/"]
+  loop_control:
+    label: "{{ item.path }}"

bootstrap/tasks/addons/homepage.yaml

@@ -20,22 +20,20 @@
     src: "{{ item.src }}"
     dest: "{{ repository_path }}/kubernetes/apps/{{ addon_namespace }}/{{ addon_name }}/{{ item.path | replace('.j2', '') }}"
     mode: "0644"
+    lstrip_blocks: true
   with_community.general.filetree: ["../templates/addons/{{ addon_name }}/"]
   loop_control:
     label: "{{ item.path }}"
 
-# https://github.com/ansible-collections/community.sops/issues/153
-- name: Template encrypted files for {{ addon_namespace }}/{{ addon_name }}
-  block:
-    - name: Template encrypted files
-      when: item.state == 'file' and 'sops' in item.path
-      community.sops.sops_encrypt:
-        path: "{{ repository_path }}/kubernetes/apps/{{ addon_namespace }}/{{ addon_name }}/{{ item.path | replace('.j2', '') }}"
-        encrypted_regex: ^(data|stringData)$
-        age: ["{{ bootstrap_age_public_key }}"]
-        content_yaml: "{{ lookup('ansible.builtin.template', item.src) | from_yaml }}"
-        mode: "0644"
-        force: true
-      with_community.general.filetree: ["../templates/addons/{{ addon_name }}/"]
-      loop_control:
-        label: "{{ item.path }}"
+- name: Template encrypted files
+  when: item.state == 'file' and 'sops' in item.path
+  community.sops.sops_encrypt:
+    path: "{{ repository_path }}/kubernetes/apps/{{ addon_namespace }}/{{ addon_name }}/{{ item.path | replace('.j2', '') }}"
+    encrypted_regex: ^(data|stringData)$
+    age: ["{{ bootstrap_age_public_key }}"]
+    content_yaml: "{{ lookup('ansible.builtin.template', item.src, lstrip_blocks=true) | from_yaml }}"
+    mode: "0644"
+    force: true
+  with_community.general.filetree: ["../templates/addons/{{ addon_name }}/"]
+  loop_control:
+    label: "{{ item.path }}"

bootstrap/tasks/addons/kube_prometheus_stack.yaml

@@ -20,21 +20,20 @@
     src: "{{ item.src }}"
     dest: "{{ repository_path }}/kubernetes/apps/{{ addon_namespace }}/{{ addon_name }}/{{ item.path | replace('.j2', '') }}"
     mode: "0644"
+    lstrip_blocks: true
   with_community.general.filetree: ["../templates/addons/{{ addon_name }}/"]
   loop_control:
     label: "{{ item.path }}"
 
-- name: Template encrypted files for {{ addon_namespace }}/{{ addon_name }}
-  block:
-    - name: Template encrypted files
-      when: item.state == 'file' and 'sops' in item.path
-      community.sops.sops_encrypt:
-        path: "{{ repository_path }}/kubernetes/apps/{{ addon_namespace }}/{{ addon_name }}/{{ item.path | replace('.j2', '') }}"
-        encrypted_regex: ^(data|stringData)$
-        age: ["{{ bootstrap_age_public_key }}"]
-        content_yaml: "{{ lookup('ansible.builtin.template', item.src) | from_yaml }}"
-        mode: "0644"
-        force: true
-      with_community.general.filetree: ["../templates/addons/{{ addon_name }}/"]
-      loop_control:
-        label: "{{ item.path }}"
+- name: Template encrypted files
+  when: item.state == 'file' and 'sops' in item.path
+  community.sops.sops_encrypt:
+    path: "{{ repository_path }}/kubernetes/apps/{{ addon_namespace }}/{{ addon_name }}/{{ item.path | replace('.j2', '') }}"
+    encrypted_regex: ^(data|stringData)$
+    age: ["{{ bootstrap_age_public_key }}"]
+    content_yaml: "{{ lookup('ansible.builtin.template', item.src, lstrip_blocks=true) | from_yaml }}"
+    mode: "0644"
+    force: true
+  with_community.general.filetree: ["../templates/addons/{{ addon_name }}/"]
+  loop_control:
+    label: "{{ item.path }}"

bootstrap/tasks/addons/kubernetes_dashboard.yaml

@@ -20,21 +20,20 @@
     src: "{{ item.src }}"
     dest: "{{ repository_path }}/kubernetes/apps/{{ addon_namespace }}/{{ addon_name }}/{{ item.path | replace('.j2', '') }}"
     mode: "0644"
+    lstrip_blocks: true
   with_community.general.filetree: ["../templates/addons/{{ addon_name }}/"]
   loop_control:
     label: "{{ item.path }}"
 
-- name: Template encrypted files for {{ addon_namespace }}/{{ addon_name }}
-  block:
-    - name: Template encrypted files
-      when: item.state == 'file' and 'sops' in item.path
-      community.sops.sops_encrypt:
-        path: "{{ repository_path }}/kubernetes/apps/{{ addon_namespace }}/{{ addon_name }}/{{ item.path | replace('.j2', '') }}"
-        encrypted_regex: ^(data|stringData)$
-        age: ["{{ bootstrap_age_public_key }}"]
-        content_yaml: "{{ lookup('ansible.builtin.template', item.src) | from_yaml }}"
-        mode: "0644"
-        force: true
-      with_community.general.filetree: ["../templates/addons/{{ addon_name }}/"]
-      loop_control:
-        label: "{{ item.path }}"
+- name: Template encrypted files
+  when: item.state == 'file' and 'sops' in item.path
+  community.sops.sops_encrypt:
+    path: "{{ repository_path }}/kubernetes/apps/{{ addon_namespace }}/{{ addon_name }}/{{ item.path | replace('.j2', '') }}"
+    encrypted_regex: ^(data|stringData)$
+    age: ["{{ bootstrap_age_public_key }}"]
+    content_yaml: "{{ lookup('ansible.builtin.template', item.src, lstrip_blocks=true) | from_yaml }}"
+    mode: "0644"
+    force: true
+  with_community.general.filetree: ["../templates/addons/{{ addon_name }}/"]
+  loop_control:
+    label: "{{ item.path }}"

bootstrap/tasks/addons/system_upgrade_controller.yaml

@@ -20,21 +20,20 @@
     src: "{{ item.src }}"
     dest: "{{ repository_path }}/kubernetes/apps/{{ addon_namespace }}/{{ addon_name }}/{{ item.path | replace('.j2', '') }}"
     mode: "0644"
+    lstrip_blocks: true
   with_community.general.filetree: ["../templates/addons/{{ addon_name }}/"]
   loop_control:
     label: "{{ item.path }}"
 
-- name: Template encrypted files for {{ addon_namespace }}/{{ addon_name }}
-  block:
-    - name: Template encrypted files
-      when: item.state == 'file' and 'sops' in item.path
-      community.sops.sops_encrypt:
-        path: "{{ repository_path }}/kubernetes/apps/{{ addon_namespace }}/{{ addon_name }}/{{ item.path | replace('.j2', '') }}"
-        encrypted_regex: ^(data|stringData)$
-        age: ["{{ bootstrap_age_public_key }}"]
-        content_yaml: "{{ lookup('ansible.builtin.template', item.src) | from_yaml }}"
-        mode: "0644"
-        force: true
-      with_community.general.filetree: ["../templates/addons/{{ addon_name }}/"]
-      loop_control:
-        label: "{{ item.path }}"
+- name: Template encrypted files
+  when: item.state == 'file' and 'sops' in item.path
+  community.sops.sops_encrypt:
+    path: "{{ repository_path }}/kubernetes/apps/{{ addon_namespace }}/{{ addon_name }}/{{ item.path | replace('.j2', '') }}"
+    encrypted_regex: ^(data|stringData)$
+    age: ["{{ bootstrap_age_public_key }}"]
+    content_yaml: "{{ lookup('ansible.builtin.template', item.src, lstrip_blocks=true) | from_yaml }}"
+    mode: "0644"
+    force: true
+  with_community.general.filetree: ["../templates/addons/{{ addon_name }}/"]
+  loop_control:
+    label: "{{ item.path }}"

bootstrap/tasks/addons/volsync.yaml

@@ -20,21 +20,20 @@
     src: "{{ item.src }}"
     dest: "{{ repository_path }}/kubernetes/apps/{{ addon_namespace }}/{{ addon_name }}/{{ item.path | replace('.j2', '') }}"
     mode: "0644"
+    lstrip_blocks: true
   with_community.general.filetree: ["../templates/addons/{{ addon_name }}/"]
   loop_control:
     label: "{{ item.path }}"
 
-- name: Template encrypted files for {{ addon_namespace }}/{{ addon_name }}
-  block:
-    - name: Template encrypted files
-      when: item.state == 'file' and 'sops' in item.path
-      community.sops.sops_encrypt:
-        path: "{{ repository_path }}/kubernetes/apps/{{ addon_namespace }}/{{ addon_name }}/{{ item.path | replace('.j2', '') }}"
-        encrypted_regex: ^(data|stringData)$
-        age: ["{{ bootstrap_age_public_key }}"]
-        content_yaml: "{{ lookup('ansible.builtin.template', item.src) | from_yaml }}"
-        mode: "0644"
-        force: true
-      with_community.general.filetree: ["../templates/addons/{{ addon_name }}/"]
-      loop_control:
-        label: "{{ item.path }}"
+- name: Template encrypted files
+  when: item.state == 'file' and 'sops' in item.path
+  community.sops.sops_encrypt:
+    path: "{{ repository_path }}/kubernetes/apps/{{ addon_namespace }}/{{ addon_name }}/{{ item.path | replace('.j2', '') }}"
+    encrypted_regex: ^(data|stringData)$
+    age: ["{{ bootstrap_age_public_key }}"]
+    content_yaml: "{{ lookup('ansible.builtin.template', item.src, lstrip_blocks=true) | from_yaml }}"
+    mode: "0644"
+    force: true
+  with_community.general.filetree: ["../templates/addons/{{ addon_name }}/"]
+  loop_control:
+    label: "{{ item.path }}"

bootstrap/tasks/addons/weave_gitops.yaml

@@ -20,21 +20,20 @@
     src: "{{ item.src }}"
     dest: "{{ repository_path }}/kubernetes/apps/{{ addon_namespace }}/{{ addon_name }}/{{ item.path | replace('.j2', '') }}"
     mode: "0644"
+    lstrip_blocks: true
   with_community.general.filetree: ["../templates/addons/{{ addon_name }}/"]
   loop_control:
     label: "{{ item.path }}"
 
-- name: Template encrypted files for {{ addon_namespace }}/{{ addon_name }}
-  block:
-    - name: Template encrypted files
-      when: item.state == 'file' and 'sops' in item.path
-      community.sops.sops_encrypt:
-        path: "{{ repository_path }}/kubernetes/apps/{{ addon_namespace }}/{{ addon_name }}/{{ item.path | replace('.j2', '') }}"
-        encrypted_regex: ^(data|stringData)$
-        age: ["{{ bootstrap_age_public_key }}"]
-        content_yaml: "{{ lookup('ansible.builtin.template', item.src) | from_yaml }}"
-        mode: "0644"
-        force: true
-      with_community.general.filetree: ["../templates/addons/{{ addon_name }}/"]
-      loop_control:
-        label: "{{ item.path }}"
+- name: Template encrypted files
+  when: item.state == 'file' and 'sops' in item.path
+  community.sops.sops_encrypt:
+    path: "{{ repository_path }}/kubernetes/apps/{{ addon_namespace }}/{{ addon_name }}/{{ item.path | replace('.j2', '') }}"
+    encrypted_regex: ^(data|stringData)$
+    age: ["{{ bootstrap_age_public_key }}"]
+    content_yaml: "{{ lookup('ansible.builtin.template', item.src, lstrip_blocks=true) | from_yaml }}"
+    mode: "0644"
+    force: true
+  with_community.general.filetree: ["../templates/addons/{{ addon_name }}/"]
+  loop_control:
+    label: "{{ item.path }}"

bootstrap/tasks/ansible/main.yaml

@@ -20,6 +20,7 @@
     src: "{{ item.src }}"
     dest: "{{ repository_path }}/ansible/{{ item.path | regex_replace('.j2$', '') }}"
     mode: "0644"
+    lstrip_blocks: true
   with_community.general.filetree:
     - "../templates/ansible/shared/"
     - "../templates/ansible/{{ bootstrap_distribution }}/"
@@ -27,20 +28,18 @@
     label: "{{ item.path }}"
 
 - name: Template Ansible encrypted files
-  block:
-    - name: Template Ansible encrypted files
-      when:
-        - "item.state == 'file'"
-        - "'sops' in item.path"
-      community.sops.sops_encrypt:
-        path: "{{ repository_path }}/ansible/{{ item.path | replace('.j2', '') }}"
-        encrypted_regex: ^(data|stringData)$
-        age: ["{{ bootstrap_age_public_key }}"]
-        content_yaml: "{{ lookup('ansible.builtin.template', item.src) | from_yaml }}"
-        mode: "0644"
-        force: true
-      with_community.general.filetree:
-        - "../templates/ansible/shared/"
-        - "../templates/ansible/{{ bootstrap_distribution }}/"
-      loop_control:
-        label: "{{ item.path }}"
+  when:
+    - "item.state == 'file'"
+    - "'sops' in item.path"
+  community.sops.sops_encrypt:
+    path: "{{ repository_path }}/ansible/{{ item.path | replace('.j2', '') }}"
+    encrypted_regex: ^(data|stringData)$
+    age: ["{{ bootstrap_age_public_key }}"]
+    content_yaml: "{{ lookup('ansible.builtin.template', item.src, lstrip_blocks=true) | from_yaml }}"
+    mode: "0644"
+    force: true
+  with_community.general.filetree:
+    - "../templates/ansible/shared/"
+    - "../templates/ansible/{{ bootstrap_distribution }}/"
+  loop_control:
+    label: "{{ item.path }}"

bootstrap/tasks/k0s/main.yaml

@@ -4,3 +4,4 @@
     src: "templates/k0s/k0s-config.yaml.j2"
     dest: "{{ repository_path }}/k0s-config.yaml"
     mode: "0644"
+    lstrip_blocks: true

bootstrap/tasks/kubernetes/main.yaml

@@ -20,6 +20,7 @@
     src: "{{ item.src }}"
     dest: "{{ repository_path }}/kubernetes/{{ item.path | regex_replace('.j2$', '') }}"
     mode: "0644"
+    lstrip_blocks: true
   with_community.general.filetree: ["../templates/kubernetes/"]
   loop_control:
     label: "{{ item.path }}"
@@ -38,6 +39,7 @@
     src: "{{ item.src }}"
     dest: "{{ repository_path }}/kubernetes/{{ item.path | regex_replace('.j2$', '') }}"
     mode: "0644"
+    lstrip_blocks: true
   with_community.general.filetree: ["../templates/kubernetes/"]
   loop_control:
     label: "{{ item.path }}"
@@ -56,23 +58,22 @@
     src: "{{ item.src }}"
     dest: "{{ repository_path }}/kubernetes/{{ item.path | regex_replace('.j2$', '') }}"
     mode: "0644"
+    lstrip_blocks: true
   with_community.general.filetree: ["../templates/kubernetes/"]
   loop_control:
     label: "{{ item.path }}"
 
 - name: Template Kubernetes encrypted files
-  block:
-    - name: Template Kubernetes encrypted files
-      when:
-        - "item.state == 'file'"
-        - "'sops' in item.path"
-      community.sops.sops_encrypt:
-        path: "{{ repository_path }}/kubernetes/{{ item.path | replace('.j2', '') }}"
-        encrypted_regex: ^(data|stringData)$
-        age: ["{{ bootstrap_age_public_key }}"]
-        content_yaml: "{{ lookup('ansible.builtin.template', item.src) | from_yaml }}"
-        mode: "0644"
-        force: true
-      with_community.general.filetree: ["../templates/kubernetes/"]
-      loop_control:
-        label: "{{ item.path }}"
+  when:
+    - "item.state == 'file'"
+    - "'sops' in item.path"
+  community.sops.sops_encrypt:
+    path: "{{ repository_path }}/kubernetes/{{ item.path | replace('.j2', '') }}"
+    encrypted_regex: ^(data|stringData)$
+    age: ["{{ bootstrap_age_public_key }}"]
+    content_yaml: "{{ lookup('ansible.builtin.template', item.src, lstrip_blocks=true) | from_yaml }}"
+    mode: "0644"
+    force: true
+  with_community.general.filetree: ["../templates/kubernetes/"]
+  loop_control:
+    label: "{{ item.path }}"

bootstrap/tasks/sops/main.yaml

@@ -4,3 +4,4 @@
     src: "templates/.sops.yaml.j2"
     dest: "{{ repository_path }}/.sops.yaml"
     mode: "0644"
+    lstrip_blocks: true

bootstrap/templates/addons/coredns/app/helmrelease.yaml.j2

@@ -1,4 +1,3 @@
-#jinja2: trim_blocks: True, lstrip_blocks: True
 ---
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease

bootstrap/templates/addons/coredns/app/kustomization.yaml.j2

@@ -1,4 +1,3 @@
-#jinja2: trim_blocks: True, lstrip_blocks: True
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization

bootstrap/templates/addons/coredns/ks.yaml.j2

@@ -1,4 +1,3 @@
-#jinja2: trim_blocks: True, lstrip_blocks: True
 ---
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization

bootstrap/templates/addons/csi-driver-nfs/app/helmrelease.yaml.j2

@@ -1,4 +1,3 @@
-#jinja2: trim_blocks: True, lstrip_blocks: True
 ---
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease

bootstrap/templates/addons/csi-driver-nfs/app/kustomization.yaml.j2

@@ -1,4 +1,3 @@
-#jinja2: trim_blocks: True, lstrip_blocks: True
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization

bootstrap/templates/addons/csi-driver-nfs/app/storageclass.yaml.j2

@@ -1,4 +1,3 @@
-#jinja2: trim_blocks: True, lstrip_blocks: True
 {% for item in csi_driver_nfs.storage_class %}
 ---
 apiVersion: storage.k8s.io/v1

bootstrap/templates/addons/csi-driver-nfs/ks.yaml.j2

@@ -1,4 +1,3 @@
-#jinja2: trim_blocks: True, lstrip_blocks: True
 ---
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization

bootstrap/templates/addons/discord-template-notifier/app/helmrelease.yaml.j2

@@ -1,4 +1,3 @@
-#jinja2: trim_blocks: True, lstrip_blocks: True
 ---
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease

bootstrap/templates/addons/discord-template-notifier/app/kustomization.yaml.j2

@@ -1,4 +1,3 @@
-#jinja2: trim_blocks: True, lstrip_blocks: True
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization

bootstrap/templates/addons/discord-template-notifier/app/secret.sops.yaml.j2

@@ -1,4 +1,3 @@
-#jinja2: trim_blocks: True, lstrip_blocks: True
 ---
 apiVersion: v1
 kind: Secret

bootstrap/templates/addons/discord-template-notifier/ks.yaml.j2

@@ -1,4 +1,3 @@
-#jinja2: trim_blocks: True, lstrip_blocks: True
 ---
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization

bootstrap/templates/addons/grafana/app/helmrelease.yaml.j2

@@ -1,4 +1,3 @@
-#jinja2: trim_blocks: True, lstrip_blocks: True
 ---
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease

bootstrap/templates/addons/homepage/app/configmap.yaml.j2

@@ -1,4 +1,3 @@
-#jinja2: trim_blocks: True, lstrip_blocks: True
 ---
 apiVersion: v1
 kind: ConfigMap

bootstrap/templates/addons/homepage/app/helmrelease.yaml.j2

@@ -1,4 +1,3 @@
-#jinja2: trim_blocks: True, lstrip_blocks: True
 ---
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease

bootstrap/templates/addons/homepage/app/kustomization.yaml.j2

@@ -1,4 +1,3 @@
-#jinja2: trim_blocks: True, lstrip_blocks: True
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization

bootstrap/templates/addons/homepage/app/secret.sops.yaml.j2

@@ -1,4 +1,3 @@
-#jinja2: trim_blocks: True, lstrip_blocks: True
 ---
 apiVersion: v1
 kind: Secret

bootstrap/templates/addons/homepage/ks.yaml.j2

@@ -1,4 +1,3 @@
-#jinja2: trim_blocks: True, lstrip_blocks: True
 ---
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization

bootstrap/templates/addons/kube-prometheus-stack/app/helmrelease.yaml.j2

@@ -1,4 +1,3 @@
-#jinja2: trim_blocks: True, lstrip_blocks: True
 ---
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease

bootstrap/templates/addons/kube-prometheus-stack/app/helmvalues.yaml.j2

@@ -1,4 +1,3 @@
-#jinja2: trim_blocks: True, lstrip_blocks: True
 ---
 apiVersion: v1
 kind: ConfigMap

bootstrap/templates/addons/kube-prometheus-stack/app/kustomization.yaml.j2

@@ -1,4 +1,3 @@
-#jinja2: trim_blocks: True, lstrip_blocks: True
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization

bootstrap/templates/addons/kube-prometheus-stack/ks.yaml.j2

@@ -1,4 +1,3 @@
-#jinja2: trim_blocks: True, lstrip_blocks: True
 ---
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization

bootstrap/templates/addons/kubernetes-dashboard/app/helmrelease.yaml.j2

@@ -1,4 +1,3 @@
-#jinja2: trim_blocks: True, lstrip_blocks: True
 ---
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease

bootstrap/templates/addons/kubernetes-dashboard/app/kustomization.yaml.j2

@@ -1,4 +1,3 @@
-#jinja2: trim_blocks: True, lstrip_blocks: True
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization

bootstrap/templates/addons/kubernetes-dashboard/app/rbac.yaml.j2

@@ -1,4 +1,3 @@
-#jinja2: trim_blocks: True, lstrip_blocks: True
 # For dashboard sign in token:
 # kubectl -n observability get secret kubernetes-dashboard -o jsonpath='{.data.token}' | base64 -d
 ---

bootstrap/templates/addons/kubernetes-dashboard/ks.yaml.j2

@@ -1,4 +1,3 @@
-#jinja2: trim_blocks: True, lstrip_blocks: True
 ---
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization

bootstrap/templates/addons/system-upgrade-controller/app/helmrelease.yaml.j2

@@ -1,4 +1,3 @@
-#jinja2: trim_blocks: True, lstrip_blocks: True
 ---
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease

bootstrap/templates/addons/system-upgrade-controller/app/kustomization.yaml.j2

@@ -1,4 +1,3 @@
-#jinja2: trim_blocks: True, lstrip_blocks: True
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization

bootstrap/templates/addons/system-upgrade-controller/app/rbac.yaml.j2

@@ -1,4 +1,3 @@
-#jinja2: trim_blocks: True, lstrip_blocks: True
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding

bootstrap/templates/addons/system-upgrade-controller/ks.yaml.j2

@@ -1,4 +1,3 @@
-#jinja2: trim_blocks: True, lstrip_blocks: True
 ---
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization

bootstrap/templates/addons/system-upgrade-controller/plans/agent.yaml.j2

@@ -1,4 +1,3 @@
-#jinja2: trim_blocks: True, lstrip_blocks: True
 ---
 apiVersion: upgrade.cattle.io/v1
 kind: Plan

bootstrap/templates/addons/system-upgrade-controller/plans/kustomization.yaml.j2

@@ -1,4 +1,3 @@
-#jinja2: trim_blocks: True, lstrip_blocks: True
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization

bootstrap/templates/addons/system-upgrade-controller/plans/server.yaml.j2

@@ -1,4 +1,3 @@
-#jinja2: trim_blocks: True, lstrip_blocks: True
 ---
 apiVersion: upgrade.cattle.io/v1
 kind: Plan

bootstrap/templates/addons/volsync/app/helmrelease.yaml.j2

@@ -1,4 +1,3 @@
-#jinja2: trim_blocks: True, lstrip_blocks: True
 ---
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease

bootstrap/templates/addons/volsync/ks.yaml.j2

@@ -1,4 +1,3 @@
-#jinja2: trim_blocks: True, lstrip_blocks: True
 ---
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization

bootstrap/templates/addons/volsync/snapshot-controller/helmrelease.yaml.j2

@@ -1,4 +1,3 @@
-#jinja2: trim_blocks: True, lstrip_blocks: True
 ---
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease

bootstrap/templates/addons/volsync/snapshot-controller/kustomization.yaml.j2

@@ -1,4 +1,3 @@
-#jinja2: trim_blocks: True, lstrip_blocks: True
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization

bootstrap/templates/addons/weave-gitops/app/helmrelease.yaml.j2

@@ -1,4 +1,3 @@
-#jinja2: trim_blocks: True, lstrip_blocks: True
 ---
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease

bootstrap/templates/addons/weave-gitops/app/kustomization.yaml.j2

@@ -1,4 +1,3 @@
-#jinja2: trim_blocks: True, lstrip_blocks: True
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization

bootstrap/templates/addons/weave-gitops/app/secret.sops.yaml.j2

@@ -1,4 +1,3 @@
-#jinja2: trim_blocks: True, lstrip_blocks: True
 ---
 apiVersion: v1
 kind: Secret

bootstrap/templates/addons/weave-gitops/ks.yaml.j2

@@ -1,4 +1,3 @@
-#jinja2: trim_blocks: True, lstrip_blocks: True
 ---
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization

bootstrap/templates/ansible/k3s/inventory/group_vars/kubernetes/main.yaml.j2

@@ -1,4 +1,3 @@
-#jinja2: trim_blocks: True, lstrip_blocks: True
 ---
 #
 # Below vars are for the xanmanning.k3s role

bootstrap/templates/ansible/k3s/inventory/group_vars/master/main.yaml.j2

@@ -1,4 +1,3 @@
-#jinja2: trim_blocks: True, lstrip_blocks: True
 ---
 # https://rancher.com/docs/k3s/latest/en/installation/install-options/server-config/
 # https://github.com/PyratLabs/ansible-role-k3s

bootstrap/templates/ansible/k3s/inventory/group_vars/worker/main.yaml.j2

@@ -1,4 +1,3 @@
-#jinja2: trim_blocks: True, lstrip_blocks: True
 ---
 # https://rancher.com/docs/k3s/latest/en/installation/install-options/agent-config/
 # https://github.com/PyratLabs/ansible-role-k3s

bootstrap/templates/ansible/k3s/playbooks/cluster-installation.yaml.j2

@@ -1,4 +1,3 @@
-#jinja2: trim_blocks: True, lstrip_blocks: True
 ---
 - name: Cluster Installation
   hosts: kubernetes

bootstrap/templates/ansible/k3s/playbooks/templates/custom-cilium-helmchart.yaml.j2.j2

@@ -1,4 +1,3 @@
-#jinja2: trim_blocks: True, lstrip_blocks: True
 ---
 # https://docs.k3s.io/helm
 apiVersion: helm.cattle.io/v1

bootstrap/templates/ansible/k3s/playbooks/templates/custom-coredns-helmchart.yaml.j2.j2

@@ -1,4 +1,3 @@
-#jinja2: trim_blocks: True, lstrip_blocks: True
 ---
 # https://docs.k3s.io/helm
 apiVersion: helm.cattle.io/v1

bootstrap/templates/ansible/shared/inventory/group_vars/kubernetes/supplemental.yaml.j2

@@ -1,4 +1,3 @@
-#jinja2: trim_blocks: True, lstrip_blocks: True
 ---
 timezone: "{{ bootstrap_timezone }}"
 github_username: "{{ bootstrap_github_username }}"

bootstrap/templates/ansible/shared/inventory/hosts.yaml.j2

@@ -1,4 +1,3 @@
-#jinja2: trim_blocks: True, lstrip_blocks: True
 ---
 kubernetes:
   children:

bootstrap/templates/ansible/shared/playbooks/cluster-nuke.yaml.j2

@@ -1,4 +1,3 @@
-#jinja2: trim_blocks: True, lstrip_blocks: True
 ---
 - name: Cluster Nuke
   hosts: kubernetes

bootstrap/templates/ansible/shared/playbooks/cluster-prepare.yaml.j2

@@ -1,4 +1,3 @@
-#jinja2: trim_blocks: True, lstrip_blocks: True
 ---
 - name: Prepare System
   hosts: kubernetes

bootstrap/templates/ansible/shared/playbooks/cluster-reboot.yaml.j2

@@ -1,4 +1,3 @@
-#jinja2: trim_blocks: True, lstrip_blocks: True
 ---
 - name: Reboot
   hosts: kubernetes

bootstrap/templates/ansible/shared/playbooks/cluster-rollout-update.yaml.j2

@@ -1,4 +1,3 @@
-#jinja2: trim_blocks: True, lstrip_blocks: True
 ---
 # https://github.com/kevincoakley/ansible-role-k8s-rolling-update
 - name: Cluster rollout update

bootstrap/templates/k0s/k0s-config.yaml.j2

@@ -1,4 +1,3 @@
-#jinja2: trim_blocks: True, lstrip_blocks: True
 ---
 apiVersion: k0sctl.k0sproject.io/v1beta1
 kind: Cluster

bootstrap/templates/kubernetes/apps/cert-manager/cert-manager/app/prometheusrule.yaml.j2

@@ -1,4 +1,3 @@
-#jinja2: trim_blocks: True
 ---
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
@@ -29,9 +28,8 @@ spec:
             severity: warning
           annotations:
             description: >
-              The domain that this cert covers will be unavailable after
-              {% raw %}{{ $value | humanizeDuration }}{% endraw %}. Clients using endpoints that this cert
-              protects will start to fail in {% raw %}{{ $value | humanizeDuration }}{% endraw %}.
+              The domain that this cert covers will be unavailable after {% raw %}{{ $value | humanizeDuration }}{% endraw %}.
+              Clients using endpoints that this cert protects will start to fail in {% raw %}{{ $value | humanizeDuration }}{% endraw %}.
             runbook_url: https://gitlab.com/uneeq-oss/cert-manager-mixin/-/blob/master/RUNBOOK.md#certmanagercertexpirysoon
             summary: |
               The cert {% raw %}{{ $labels.name }}{% endraw %} is {% raw %}{{ $value | humanizeDuration }}{% endraw %} from expiry, it should have renewed over a week ago.

bootstrap/templates/kubernetes/apps/default/kustomization.yaml.j2

@@ -1,4 +1,3 @@
-#jinja2: trim_blocks: True, lstrip_blocks: True
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization

bootstrap/templates/kubernetes/apps/flux-system/kustomization.yaml.j2

@@ -1,4 +1,3 @@
-#jinja2: trim_blocks: True, lstrip_blocks: True
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization

bootstrap/templates/kubernetes/apps/kube-system/cilium/app/helmvalues.yaml.j2

@@ -1,4 +1,3 @@
-#jinja2: trim_blocks: True, lstrip_blocks: True
 ---
 apiVersion: v1
 kind: ConfigMap

bootstrap/templates/kubernetes/apps/kube-system/cilium/app/kustomization.yaml.j2

@@ -1,4 +1,3 @@
-#jinja2: trim_blocks: True, lstrip_blocks: True
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization

bootstrap/templates/kubernetes/apps/kube-system/kustomization.yaml.j2

@@ -1,4 +1,3 @@
-#jinja2: trim_blocks: True, lstrip_blocks: True
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization

bootstrap/templates/kubernetes/apps/network/echo-server/app/helmrelease.yaml.j2

@@ -1,4 +1,3 @@
-#jinja2: trim_blocks: True, lstrip_blocks: True
 ---
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease

bootstrap/templates/kubernetes/apps/network/nginx/certificates/kustomization.yaml.j2

@@ -1,4 +1,3 @@
-#jinja2: trim_blocks: True, lstrip_blocks: True
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization

bootstrap/templates/kubernetes/apps/network/nginx/external/helmrelease.yaml.j2

@@ -1,4 +1,3 @@
-#jinja2: trim_blocks: True, lstrip_blocks: True
 ---
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease

bootstrap/templates/kubernetes/apps/network/nginx/internal/helmrelease.yaml.j2

@@ -1,4 +1,3 @@
-#jinja2: trim_blocks: True, lstrip_blocks: True
 ---
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease

bootstrap/templates/kubernetes/apps/observability/kustomization.yaml.j2

@@ -1,4 +1,3 @@
-#jinja2: trim_blocks: True, lstrip_blocks: True
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization

bootstrap/templates/kubernetes/apps/storage/kustomization.yaml.j2

@@ -1,4 +1,3 @@
-#jinja2: trim_blocks: True, lstrip_blocks: True
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization

bootstrap/templates/kubernetes/apps/tools/kustomization.yaml.j2

@@ -1,4 +1,3 @@
-#jinja2: trim_blocks: True, lstrip_blocks: True
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization

bootstrap/templates/kubernetes/flux/config/cluster.yaml.j2

@@ -1,4 +1,3 @@
-#jinja2: trim_blocks: True, lstrip_blocks: True
 ---
 apiVersion: source.toolkit.fluxcd.io/v1
 kind: GitRepository

bootstrap/templates/kubernetes/flux/vars/cluster-settings.yaml.j2

@@ -1,4 +1,3 @@
-#jinja2: trim_blocks: True, lstrip_blocks: True
 ---
 apiVersion: v1
 kind: ConfigMap