From a4731906d98a33eb5312a01c6fbb9bdf63dde5c2 Mon Sep 17 00:00:00 2001 From: Devin Buhl Date: Sun, 14 Jan 2024 17:08:59 -0500 Subject: [PATCH] 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 * fix: cert-manager block was neing stripped Signed-off-by: Devin Buhl --------- Signed-off-by: Devin Buhl --- bootstrap/tasks/addons/coredns.yaml | 27 ++++++++------- bootstrap/tasks/addons/csi_driver_nfs.yaml | 27 ++++++++------- .../addons/discord_template_notifier.yaml | 27 ++++++++------- bootstrap/tasks/addons/grafana.yaml | 27 ++++++++------- bootstrap/tasks/addons/homepage.yaml | 28 ++++++++-------- .../tasks/addons/kube_prometheus_stack.yaml | 27 ++++++++------- .../tasks/addons/kubernetes_dashboard.yaml | 27 ++++++++------- .../addons/system_upgrade_controller.yaml | 27 ++++++++------- bootstrap/tasks/addons/volsync.yaml | 27 ++++++++------- bootstrap/tasks/addons/weave_gitops.yaml | 27 ++++++++------- bootstrap/tasks/ansible/main.yaml | 33 +++++++++---------- bootstrap/tasks/k0s/main.yaml | 1 + bootstrap/tasks/kubernetes/main.yaml | 31 ++++++++--------- bootstrap/tasks/sops/main.yaml | 1 + .../addons/coredns/app/helmrelease.yaml.j2 | 1 - .../addons/coredns/app/kustomization.yaml.j2 | 1 - bootstrap/templates/addons/coredns/ks.yaml.j2 | 1 - .../csi-driver-nfs/app/helmrelease.yaml.j2 | 1 - .../csi-driver-nfs/app/kustomization.yaml.j2 | 1 - .../csi-driver-nfs/app/storageclass.yaml.j2 | 1 - .../addons/csi-driver-nfs/ks.yaml.j2 | 1 - .../app/helmrelease.yaml.j2 | 1 - .../app/kustomization.yaml.j2 | 1 - .../app/secret.sops.yaml.j2 | 1 - .../discord-template-notifier/ks.yaml.j2 | 1 - .../addons/grafana/app/helmrelease.yaml.j2 | 1 - .../addons/homepage/app/configmap.yaml.j2 | 1 - .../addons/homepage/app/helmrelease.yaml.j2 | 1 - .../addons/homepage/app/kustomization.yaml.j2 | 1 - .../addons/homepage/app/secret.sops.yaml.j2 | 1 - .../templates/addons/homepage/ks.yaml.j2 | 1 - .../app/helmrelease.yaml.j2 | 1 - .../app/helmvalues.yaml.j2 | 1 - .../app/kustomization.yaml.j2 | 1 - .../addons/kube-prometheus-stack/ks.yaml.j2 | 1 - .../app/helmrelease.yaml.j2 | 1 - .../app/kustomization.yaml.j2 | 1 - .../kubernetes-dashboard/app/rbac.yaml.j2 | 1 - .../addons/kubernetes-dashboard/ks.yaml.j2 | 1 - .../app/helmrelease.yaml.j2 | 1 - .../app/kustomization.yaml.j2 | 1 - .../app/rbac.yaml.j2 | 1 - .../system-upgrade-controller/ks.yaml.j2 | 1 - .../plans/agent.yaml.j2 | 1 - .../plans/kustomization.yaml.j2 | 1 - .../plans/server.yaml.j2 | 1 - .../addons/volsync/app/helmrelease.yaml.j2 | 1 - bootstrap/templates/addons/volsync/ks.yaml.j2 | 1 - .../snapshot-controller/helmrelease.yaml.j2 | 1 - .../snapshot-controller/kustomization.yaml.j2 | 1 - .../weave-gitops/app/helmrelease.yaml.j2 | 1 - .../weave-gitops/app/kustomization.yaml.j2 | 1 - .../weave-gitops/app/secret.sops.yaml.j2 | 1 - .../templates/addons/weave-gitops/ks.yaml.j2 | 1 - .../group_vars/kubernetes/main.yaml.j2 | 1 - .../inventory/group_vars/master/main.yaml.j2 | 1 - .../inventory/group_vars/worker/main.yaml.j2 | 1 - .../playbooks/cluster-installation.yaml.j2 | 1 - .../custom-cilium-helmchart.yaml.j2.j2 | 1 - .../custom-coredns-helmchart.yaml.j2.j2 | 1 - .../kubernetes/supplemental.yaml.j2 | 1 - .../ansible/shared/inventory/hosts.yaml.j2 | 1 - .../shared/playbooks/cluster-nuke.yaml.j2 | 1 - .../shared/playbooks/cluster-prepare.yaml.j2 | 1 - .../shared/playbooks/cluster-reboot.yaml.j2 | 1 - .../playbooks/cluster-rollout-update.yaml.j2 | 1 - bootstrap/templates/k0s/k0s-config.yaml.j2 | 1 - .../cert-manager/app/prometheusrule.yaml.j2 | 6 ++-- .../apps/default/kustomization.yaml.j2 | 1 - .../apps/flux-system/kustomization.yaml.j2 | 1 - .../kube-system/cilium/app/helmvalues.yaml.j2 | 1 - .../cilium/app/kustomization.yaml.j2 | 1 - .../apps/kube-system/kustomization.yaml.j2 | 1 - .../echo-server/app/helmrelease.yaml.j2 | 1 - .../nginx/certificates/kustomization.yaml.j2 | 1 - .../nginx/external/helmrelease.yaml.j2 | 1 - .../nginx/internal/helmrelease.yaml.j2 | 1 - .../apps/observability/kustomization.yaml.j2 | 1 - .../apps/storage/kustomization.yaml.j2 | 1 - .../apps/tools/kustomization.yaml.j2 | 1 - .../kubernetes/flux/config/cluster.yaml.j2 | 1 - .../flux/vars/cluster-settings.yaml.j2 | 1 - 82 files changed, 166 insertions(+), 244 deletions(-) diff --git a/bootstrap/tasks/addons/coredns.yaml b/bootstrap/tasks/addons/coredns.yaml index b317e3cd..3eda3eba 100644 --- a/bootstrap/tasks/addons/coredns.yaml +++ b/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 }}" diff --git a/bootstrap/tasks/addons/csi_driver_nfs.yaml b/bootstrap/tasks/addons/csi_driver_nfs.yaml index 43642b04..21eac93c 100644 --- a/bootstrap/tasks/addons/csi_driver_nfs.yaml +++ b/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 }}" diff --git a/bootstrap/tasks/addons/discord_template_notifier.yaml b/bootstrap/tasks/addons/discord_template_notifier.yaml index 2389688a..67d20784 100644 --- a/bootstrap/tasks/addons/discord_template_notifier.yaml +++ b/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 }}" diff --git a/bootstrap/tasks/addons/grafana.yaml b/bootstrap/tasks/addons/grafana.yaml index f8ac8eed..b7464c4b 100644 --- a/bootstrap/tasks/addons/grafana.yaml +++ b/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 }}" diff --git a/bootstrap/tasks/addons/homepage.yaml b/bootstrap/tasks/addons/homepage.yaml index da7959e6..c4e8903e 100644 --- a/bootstrap/tasks/addons/homepage.yaml +++ b/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 }}" diff --git a/bootstrap/tasks/addons/kube_prometheus_stack.yaml b/bootstrap/tasks/addons/kube_prometheus_stack.yaml index 2273c292..210a2dad 100644 --- a/bootstrap/tasks/addons/kube_prometheus_stack.yaml +++ b/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 }}" diff --git a/bootstrap/tasks/addons/kubernetes_dashboard.yaml b/bootstrap/tasks/addons/kubernetes_dashboard.yaml index 708ebcb8..4886e28d 100644 --- a/bootstrap/tasks/addons/kubernetes_dashboard.yaml +++ b/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 }}" diff --git a/bootstrap/tasks/addons/system_upgrade_controller.yaml b/bootstrap/tasks/addons/system_upgrade_controller.yaml index eb2bc8c3..376f95d8 100644 --- a/bootstrap/tasks/addons/system_upgrade_controller.yaml +++ b/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 }}" diff --git a/bootstrap/tasks/addons/volsync.yaml b/bootstrap/tasks/addons/volsync.yaml index 01999de8..afb2c2ab 100644 --- a/bootstrap/tasks/addons/volsync.yaml +++ b/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 }}" diff --git a/bootstrap/tasks/addons/weave_gitops.yaml b/bootstrap/tasks/addons/weave_gitops.yaml index fade1f08..819117ca 100644 --- a/bootstrap/tasks/addons/weave_gitops.yaml +++ b/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 }}" diff --git a/bootstrap/tasks/ansible/main.yaml b/bootstrap/tasks/ansible/main.yaml index e871dae5..e4fc5796 100644 --- a/bootstrap/tasks/ansible/main.yaml +++ b/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 }}" diff --git a/bootstrap/tasks/k0s/main.yaml b/bootstrap/tasks/k0s/main.yaml index bcb04e9c..af1d4ac0 100644 --- a/bootstrap/tasks/k0s/main.yaml +++ b/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 diff --git a/bootstrap/tasks/kubernetes/main.yaml b/bootstrap/tasks/kubernetes/main.yaml index e5d8143d..2e239bf0 100644 --- a/bootstrap/tasks/kubernetes/main.yaml +++ b/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 }}" diff --git a/bootstrap/tasks/sops/main.yaml b/bootstrap/tasks/sops/main.yaml index 7aaaf6b9..28a7b0b1 100644 --- a/bootstrap/tasks/sops/main.yaml +++ b/bootstrap/tasks/sops/main.yaml @@ -4,3 +4,4 @@ src: "templates/.sops.yaml.j2" dest: "{{ repository_path }}/.sops.yaml" mode: "0644" + lstrip_blocks: true diff --git a/bootstrap/templates/addons/coredns/app/helmrelease.yaml.j2 b/bootstrap/templates/addons/coredns/app/helmrelease.yaml.j2 index b4db8210..c3ec35c4 100644 --- a/bootstrap/templates/addons/coredns/app/helmrelease.yaml.j2 +++ b/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 diff --git a/bootstrap/templates/addons/coredns/app/kustomization.yaml.j2 b/bootstrap/templates/addons/coredns/app/kustomization.yaml.j2 index 6cb81530..5dd7baca 100644 --- a/bootstrap/templates/addons/coredns/app/kustomization.yaml.j2 +++ b/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 diff --git a/bootstrap/templates/addons/coredns/ks.yaml.j2 b/bootstrap/templates/addons/coredns/ks.yaml.j2 index 32f546f6..bf2a537e 100644 --- a/bootstrap/templates/addons/coredns/ks.yaml.j2 +++ b/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 diff --git a/bootstrap/templates/addons/csi-driver-nfs/app/helmrelease.yaml.j2 b/bootstrap/templates/addons/csi-driver-nfs/app/helmrelease.yaml.j2 index eab32664..110011a7 100644 --- a/bootstrap/templates/addons/csi-driver-nfs/app/helmrelease.yaml.j2 +++ b/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 diff --git a/bootstrap/templates/addons/csi-driver-nfs/app/kustomization.yaml.j2 b/bootstrap/templates/addons/csi-driver-nfs/app/kustomization.yaml.j2 index fd7129e3..70fd2032 100644 --- a/bootstrap/templates/addons/csi-driver-nfs/app/kustomization.yaml.j2 +++ b/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 diff --git a/bootstrap/templates/addons/csi-driver-nfs/app/storageclass.yaml.j2 b/bootstrap/templates/addons/csi-driver-nfs/app/storageclass.yaml.j2 index d62dc847..aed4d0ca 100644 --- a/bootstrap/templates/addons/csi-driver-nfs/app/storageclass.yaml.j2 +++ b/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 diff --git a/bootstrap/templates/addons/csi-driver-nfs/ks.yaml.j2 b/bootstrap/templates/addons/csi-driver-nfs/ks.yaml.j2 index 5bef1cda..13b49712 100644 --- a/bootstrap/templates/addons/csi-driver-nfs/ks.yaml.j2 +++ b/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 diff --git a/bootstrap/templates/addons/discord-template-notifier/app/helmrelease.yaml.j2 b/bootstrap/templates/addons/discord-template-notifier/app/helmrelease.yaml.j2 index cf36c79c..ec1426be 100644 --- a/bootstrap/templates/addons/discord-template-notifier/app/helmrelease.yaml.j2 +++ b/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 diff --git a/bootstrap/templates/addons/discord-template-notifier/app/kustomization.yaml.j2 b/bootstrap/templates/addons/discord-template-notifier/app/kustomization.yaml.j2 index c7514bd0..95bf4747 100644 --- a/bootstrap/templates/addons/discord-template-notifier/app/kustomization.yaml.j2 +++ b/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 diff --git a/bootstrap/templates/addons/discord-template-notifier/app/secret.sops.yaml.j2 b/bootstrap/templates/addons/discord-template-notifier/app/secret.sops.yaml.j2 index 57205983..12759d18 100644 --- a/bootstrap/templates/addons/discord-template-notifier/app/secret.sops.yaml.j2 +++ b/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 diff --git a/bootstrap/templates/addons/discord-template-notifier/ks.yaml.j2 b/bootstrap/templates/addons/discord-template-notifier/ks.yaml.j2 index 550cbac8..0b333f3c 100644 --- a/bootstrap/templates/addons/discord-template-notifier/ks.yaml.j2 +++ b/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 diff --git a/bootstrap/templates/addons/grafana/app/helmrelease.yaml.j2 b/bootstrap/templates/addons/grafana/app/helmrelease.yaml.j2 index 455c547b..0c5f1f7e 100644 --- a/bootstrap/templates/addons/grafana/app/helmrelease.yaml.j2 +++ b/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 diff --git a/bootstrap/templates/addons/homepage/app/configmap.yaml.j2 b/bootstrap/templates/addons/homepage/app/configmap.yaml.j2 index b51f58c4..b58b2ca9 100644 --- a/bootstrap/templates/addons/homepage/app/configmap.yaml.j2 +++ b/bootstrap/templates/addons/homepage/app/configmap.yaml.j2 @@ -1,4 +1,3 @@ -#jinja2: trim_blocks: True, lstrip_blocks: True --- apiVersion: v1 kind: ConfigMap diff --git a/bootstrap/templates/addons/homepage/app/helmrelease.yaml.j2 b/bootstrap/templates/addons/homepage/app/helmrelease.yaml.j2 index 486a8545..70f6ac65 100644 --- a/bootstrap/templates/addons/homepage/app/helmrelease.yaml.j2 +++ b/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 diff --git a/bootstrap/templates/addons/homepage/app/kustomization.yaml.j2 b/bootstrap/templates/addons/homepage/app/kustomization.yaml.j2 index f609e602..c1a01c52 100644 --- a/bootstrap/templates/addons/homepage/app/kustomization.yaml.j2 +++ b/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 diff --git a/bootstrap/templates/addons/homepage/app/secret.sops.yaml.j2 b/bootstrap/templates/addons/homepage/app/secret.sops.yaml.j2 index c726f0dc..609cb953 100644 --- a/bootstrap/templates/addons/homepage/app/secret.sops.yaml.j2 +++ b/bootstrap/templates/addons/homepage/app/secret.sops.yaml.j2 @@ -1,4 +1,3 @@ -#jinja2: trim_blocks: True, lstrip_blocks: True --- apiVersion: v1 kind: Secret diff --git a/bootstrap/templates/addons/homepage/ks.yaml.j2 b/bootstrap/templates/addons/homepage/ks.yaml.j2 index 3ce2f5d5..6466cb56 100644 --- a/bootstrap/templates/addons/homepage/ks.yaml.j2 +++ b/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 diff --git a/bootstrap/templates/addons/kube-prometheus-stack/app/helmrelease.yaml.j2 b/bootstrap/templates/addons/kube-prometheus-stack/app/helmrelease.yaml.j2 index a00fb779..73b61967 100644 --- a/bootstrap/templates/addons/kube-prometheus-stack/app/helmrelease.yaml.j2 +++ b/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 diff --git a/bootstrap/templates/addons/kube-prometheus-stack/app/helmvalues.yaml.j2 b/bootstrap/templates/addons/kube-prometheus-stack/app/helmvalues.yaml.j2 index 20c4232e..92f02399 100644 --- a/bootstrap/templates/addons/kube-prometheus-stack/app/helmvalues.yaml.j2 +++ b/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 diff --git a/bootstrap/templates/addons/kube-prometheus-stack/app/kustomization.yaml.j2 b/bootstrap/templates/addons/kube-prometheus-stack/app/kustomization.yaml.j2 index d02ddbf5..dc39651b 100644 --- a/bootstrap/templates/addons/kube-prometheus-stack/app/kustomization.yaml.j2 +++ b/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 diff --git a/bootstrap/templates/addons/kube-prometheus-stack/ks.yaml.j2 b/bootstrap/templates/addons/kube-prometheus-stack/ks.yaml.j2 index fe740591..f84c6a34 100644 --- a/bootstrap/templates/addons/kube-prometheus-stack/ks.yaml.j2 +++ b/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 diff --git a/bootstrap/templates/addons/kubernetes-dashboard/app/helmrelease.yaml.j2 b/bootstrap/templates/addons/kubernetes-dashboard/app/helmrelease.yaml.j2 index ad9993e8..c783875f 100644 --- a/bootstrap/templates/addons/kubernetes-dashboard/app/helmrelease.yaml.j2 +++ b/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 diff --git a/bootstrap/templates/addons/kubernetes-dashboard/app/kustomization.yaml.j2 b/bootstrap/templates/addons/kubernetes-dashboard/app/kustomization.yaml.j2 index a133d4b9..b5b97586 100644 --- a/bootstrap/templates/addons/kubernetes-dashboard/app/kustomization.yaml.j2 +++ b/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 diff --git a/bootstrap/templates/addons/kubernetes-dashboard/app/rbac.yaml.j2 b/bootstrap/templates/addons/kubernetes-dashboard/app/rbac.yaml.j2 index 556aa63e..831de090 100644 --- a/bootstrap/templates/addons/kubernetes-dashboard/app/rbac.yaml.j2 +++ b/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 --- diff --git a/bootstrap/templates/addons/kubernetes-dashboard/ks.yaml.j2 b/bootstrap/templates/addons/kubernetes-dashboard/ks.yaml.j2 index 52846b97..ca65d7c2 100644 --- a/bootstrap/templates/addons/kubernetes-dashboard/ks.yaml.j2 +++ b/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 diff --git a/bootstrap/templates/addons/system-upgrade-controller/app/helmrelease.yaml.j2 b/bootstrap/templates/addons/system-upgrade-controller/app/helmrelease.yaml.j2 index 3057b12f..aae67a2e 100644 --- a/bootstrap/templates/addons/system-upgrade-controller/app/helmrelease.yaml.j2 +++ b/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 diff --git a/bootstrap/templates/addons/system-upgrade-controller/app/kustomization.yaml.j2 b/bootstrap/templates/addons/system-upgrade-controller/app/kustomization.yaml.j2 index e604b2db..74d66703 100644 --- a/bootstrap/templates/addons/system-upgrade-controller/app/kustomization.yaml.j2 +++ b/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 diff --git a/bootstrap/templates/addons/system-upgrade-controller/app/rbac.yaml.j2 b/bootstrap/templates/addons/system-upgrade-controller/app/rbac.yaml.j2 index e1711e6a..17fee325 100644 --- a/bootstrap/templates/addons/system-upgrade-controller/app/rbac.yaml.j2 +++ b/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 diff --git a/bootstrap/templates/addons/system-upgrade-controller/ks.yaml.j2 b/bootstrap/templates/addons/system-upgrade-controller/ks.yaml.j2 index ecc6b4fc..3d05ac51 100644 --- a/bootstrap/templates/addons/system-upgrade-controller/ks.yaml.j2 +++ b/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 diff --git a/bootstrap/templates/addons/system-upgrade-controller/plans/agent.yaml.j2 b/bootstrap/templates/addons/system-upgrade-controller/plans/agent.yaml.j2 index 78b6d294..dcbd38db 100644 --- a/bootstrap/templates/addons/system-upgrade-controller/plans/agent.yaml.j2 +++ b/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 diff --git a/bootstrap/templates/addons/system-upgrade-controller/plans/kustomization.yaml.j2 b/bootstrap/templates/addons/system-upgrade-controller/plans/kustomization.yaml.j2 index 2de6d6a0..2a658c35 100644 --- a/bootstrap/templates/addons/system-upgrade-controller/plans/kustomization.yaml.j2 +++ b/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 diff --git a/bootstrap/templates/addons/system-upgrade-controller/plans/server.yaml.j2 b/bootstrap/templates/addons/system-upgrade-controller/plans/server.yaml.j2 index 047b49df..773883ce 100644 --- a/bootstrap/templates/addons/system-upgrade-controller/plans/server.yaml.j2 +++ b/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 diff --git a/bootstrap/templates/addons/volsync/app/helmrelease.yaml.j2 b/bootstrap/templates/addons/volsync/app/helmrelease.yaml.j2 index d0e9f095..0ba4ca82 100644 --- a/bootstrap/templates/addons/volsync/app/helmrelease.yaml.j2 +++ b/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 diff --git a/bootstrap/templates/addons/volsync/ks.yaml.j2 b/bootstrap/templates/addons/volsync/ks.yaml.j2 index d2ea2364..7e4bfd1e 100644 --- a/bootstrap/templates/addons/volsync/ks.yaml.j2 +++ b/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 diff --git a/bootstrap/templates/addons/volsync/snapshot-controller/helmrelease.yaml.j2 b/bootstrap/templates/addons/volsync/snapshot-controller/helmrelease.yaml.j2 index c9c49a0e..5207dd5a 100644 --- a/bootstrap/templates/addons/volsync/snapshot-controller/helmrelease.yaml.j2 +++ b/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 diff --git a/bootstrap/templates/addons/volsync/snapshot-controller/kustomization.yaml.j2 b/bootstrap/templates/addons/volsync/snapshot-controller/kustomization.yaml.j2 index 6cb81530..5dd7baca 100644 --- a/bootstrap/templates/addons/volsync/snapshot-controller/kustomization.yaml.j2 +++ b/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 diff --git a/bootstrap/templates/addons/weave-gitops/app/helmrelease.yaml.j2 b/bootstrap/templates/addons/weave-gitops/app/helmrelease.yaml.j2 index 171872db..04ecff6c 100644 --- a/bootstrap/templates/addons/weave-gitops/app/helmrelease.yaml.j2 +++ b/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 diff --git a/bootstrap/templates/addons/weave-gitops/app/kustomization.yaml.j2 b/bootstrap/templates/addons/weave-gitops/app/kustomization.yaml.j2 index c7514bd0..95bf4747 100644 --- a/bootstrap/templates/addons/weave-gitops/app/kustomization.yaml.j2 +++ b/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 diff --git a/bootstrap/templates/addons/weave-gitops/app/secret.sops.yaml.j2 b/bootstrap/templates/addons/weave-gitops/app/secret.sops.yaml.j2 index 367cc1aa..22486957 100644 --- a/bootstrap/templates/addons/weave-gitops/app/secret.sops.yaml.j2 +++ b/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 diff --git a/bootstrap/templates/addons/weave-gitops/ks.yaml.j2 b/bootstrap/templates/addons/weave-gitops/ks.yaml.j2 index b02dd0b3..9a2bd272 100644 --- a/bootstrap/templates/addons/weave-gitops/ks.yaml.j2 +++ b/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 diff --git a/bootstrap/templates/ansible/k3s/inventory/group_vars/kubernetes/main.yaml.j2 b/bootstrap/templates/ansible/k3s/inventory/group_vars/kubernetes/main.yaml.j2 index 840a4eb2..2275546c 100644 --- a/bootstrap/templates/ansible/k3s/inventory/group_vars/kubernetes/main.yaml.j2 +++ b/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 diff --git a/bootstrap/templates/ansible/k3s/inventory/group_vars/master/main.yaml.j2 b/bootstrap/templates/ansible/k3s/inventory/group_vars/master/main.yaml.j2 index 7ecd43ce..c428f1f2 100644 --- a/bootstrap/templates/ansible/k3s/inventory/group_vars/master/main.yaml.j2 +++ b/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 diff --git a/bootstrap/templates/ansible/k3s/inventory/group_vars/worker/main.yaml.j2 b/bootstrap/templates/ansible/k3s/inventory/group_vars/worker/main.yaml.j2 index bfeb76c7..596203aa 100644 --- a/bootstrap/templates/ansible/k3s/inventory/group_vars/worker/main.yaml.j2 +++ b/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 diff --git a/bootstrap/templates/ansible/k3s/playbooks/cluster-installation.yaml.j2 b/bootstrap/templates/ansible/k3s/playbooks/cluster-installation.yaml.j2 index 15404bb5..7df60846 100644 --- a/bootstrap/templates/ansible/k3s/playbooks/cluster-installation.yaml.j2 +++ b/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 diff --git a/bootstrap/templates/ansible/k3s/playbooks/templates/custom-cilium-helmchart.yaml.j2.j2 b/bootstrap/templates/ansible/k3s/playbooks/templates/custom-cilium-helmchart.yaml.j2.j2 index cec121c7..9f2f7f06 100644 --- a/bootstrap/templates/ansible/k3s/playbooks/templates/custom-cilium-helmchart.yaml.j2.j2 +++ b/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 diff --git a/bootstrap/templates/ansible/k3s/playbooks/templates/custom-coredns-helmchart.yaml.j2.j2 b/bootstrap/templates/ansible/k3s/playbooks/templates/custom-coredns-helmchart.yaml.j2.j2 index 53617f8b..cc04a63a 100644 --- a/bootstrap/templates/ansible/k3s/playbooks/templates/custom-coredns-helmchart.yaml.j2.j2 +++ b/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 diff --git a/bootstrap/templates/ansible/shared/inventory/group_vars/kubernetes/supplemental.yaml.j2 b/bootstrap/templates/ansible/shared/inventory/group_vars/kubernetes/supplemental.yaml.j2 index 260dee17..d50ad3b5 100644 --- a/bootstrap/templates/ansible/shared/inventory/group_vars/kubernetes/supplemental.yaml.j2 +++ b/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 }}" diff --git a/bootstrap/templates/ansible/shared/inventory/hosts.yaml.j2 b/bootstrap/templates/ansible/shared/inventory/hosts.yaml.j2 index 028c3af5..2dec9f3e 100644 --- a/bootstrap/templates/ansible/shared/inventory/hosts.yaml.j2 +++ b/bootstrap/templates/ansible/shared/inventory/hosts.yaml.j2 @@ -1,4 +1,3 @@ -#jinja2: trim_blocks: True, lstrip_blocks: True --- kubernetes: children: diff --git a/bootstrap/templates/ansible/shared/playbooks/cluster-nuke.yaml.j2 b/bootstrap/templates/ansible/shared/playbooks/cluster-nuke.yaml.j2 index a8729824..41ae74f6 100644 --- a/bootstrap/templates/ansible/shared/playbooks/cluster-nuke.yaml.j2 +++ b/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 diff --git a/bootstrap/templates/ansible/shared/playbooks/cluster-prepare.yaml.j2 b/bootstrap/templates/ansible/shared/playbooks/cluster-prepare.yaml.j2 index f0122a9a..d221fc1d 100644 --- a/bootstrap/templates/ansible/shared/playbooks/cluster-prepare.yaml.j2 +++ b/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 diff --git a/bootstrap/templates/ansible/shared/playbooks/cluster-reboot.yaml.j2 b/bootstrap/templates/ansible/shared/playbooks/cluster-reboot.yaml.j2 index 5671f377..07ae62a8 100644 --- a/bootstrap/templates/ansible/shared/playbooks/cluster-reboot.yaml.j2 +++ b/bootstrap/templates/ansible/shared/playbooks/cluster-reboot.yaml.j2 @@ -1,4 +1,3 @@ -#jinja2: trim_blocks: True, lstrip_blocks: True --- - name: Reboot hosts: kubernetes diff --git a/bootstrap/templates/ansible/shared/playbooks/cluster-rollout-update.yaml.j2 b/bootstrap/templates/ansible/shared/playbooks/cluster-rollout-update.yaml.j2 index e3dfc23f..727a5ed7 100644 --- a/bootstrap/templates/ansible/shared/playbooks/cluster-rollout-update.yaml.j2 +++ b/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 diff --git a/bootstrap/templates/k0s/k0s-config.yaml.j2 b/bootstrap/templates/k0s/k0s-config.yaml.j2 index 70d9d0bd..152af7d9 100644 --- a/bootstrap/templates/k0s/k0s-config.yaml.j2 +++ b/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 diff --git a/bootstrap/templates/kubernetes/apps/cert-manager/cert-manager/app/prometheusrule.yaml.j2 b/bootstrap/templates/kubernetes/apps/cert-manager/cert-manager/app/prometheusrule.yaml.j2 index a7541f6d..b96bf13f 100644 --- a/bootstrap/templates/kubernetes/apps/cert-manager/cert-manager/app/prometheusrule.yaml.j2 +++ b/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. diff --git a/bootstrap/templates/kubernetes/apps/default/kustomization.yaml.j2 b/bootstrap/templates/kubernetes/apps/default/kustomization.yaml.j2 index 9a0c5c41..aee3cfd6 100644 --- a/bootstrap/templates/kubernetes/apps/default/kustomization.yaml.j2 +++ b/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 diff --git a/bootstrap/templates/kubernetes/apps/flux-system/kustomization.yaml.j2 b/bootstrap/templates/kubernetes/apps/flux-system/kustomization.yaml.j2 index bf4d7e09..018b8887 100644 --- a/bootstrap/templates/kubernetes/apps/flux-system/kustomization.yaml.j2 +++ b/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 diff --git a/bootstrap/templates/kubernetes/apps/kube-system/cilium/app/helmvalues.yaml.j2 b/bootstrap/templates/kubernetes/apps/kube-system/cilium/app/helmvalues.yaml.j2 index 2ef339ca..713b0a9c 100644 --- a/bootstrap/templates/kubernetes/apps/kube-system/cilium/app/helmvalues.yaml.j2 +++ b/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 diff --git a/bootstrap/templates/kubernetes/apps/kube-system/cilium/app/kustomization.yaml.j2 b/bootstrap/templates/kubernetes/apps/kube-system/cilium/app/kustomization.yaml.j2 index fedf3812..5507b29b 100644 --- a/bootstrap/templates/kubernetes/apps/kube-system/cilium/app/kustomization.yaml.j2 +++ b/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 diff --git a/bootstrap/templates/kubernetes/apps/kube-system/kustomization.yaml.j2 b/bootstrap/templates/kubernetes/apps/kube-system/kustomization.yaml.j2 index 5cb2806e..d62c0335 100644 --- a/bootstrap/templates/kubernetes/apps/kube-system/kustomization.yaml.j2 +++ b/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 diff --git a/bootstrap/templates/kubernetes/apps/network/echo-server/app/helmrelease.yaml.j2 b/bootstrap/templates/kubernetes/apps/network/echo-server/app/helmrelease.yaml.j2 index 65cc466b..97d77e9b 100644 --- a/bootstrap/templates/kubernetes/apps/network/echo-server/app/helmrelease.yaml.j2 +++ b/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 diff --git a/bootstrap/templates/kubernetes/apps/network/nginx/certificates/kustomization.yaml.j2 b/bootstrap/templates/kubernetes/apps/network/nginx/certificates/kustomization.yaml.j2 index 81f57a48..59b9fa80 100644 --- a/bootstrap/templates/kubernetes/apps/network/nginx/certificates/kustomization.yaml.j2 +++ b/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 diff --git a/bootstrap/templates/kubernetes/apps/network/nginx/external/helmrelease.yaml.j2 b/bootstrap/templates/kubernetes/apps/network/nginx/external/helmrelease.yaml.j2 index 8882e2f1..479bfb61 100644 --- a/bootstrap/templates/kubernetes/apps/network/nginx/external/helmrelease.yaml.j2 +++ b/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 diff --git a/bootstrap/templates/kubernetes/apps/network/nginx/internal/helmrelease.yaml.j2 b/bootstrap/templates/kubernetes/apps/network/nginx/internal/helmrelease.yaml.j2 index 87fc15fd..79d5d1fe 100644 --- a/bootstrap/templates/kubernetes/apps/network/nginx/internal/helmrelease.yaml.j2 +++ b/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 diff --git a/bootstrap/templates/kubernetes/apps/observability/kustomization.yaml.j2 b/bootstrap/templates/kubernetes/apps/observability/kustomization.yaml.j2 index 982a0929..23600267 100644 --- a/bootstrap/templates/kubernetes/apps/observability/kustomization.yaml.j2 +++ b/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 diff --git a/bootstrap/templates/kubernetes/apps/storage/kustomization.yaml.j2 b/bootstrap/templates/kubernetes/apps/storage/kustomization.yaml.j2 index 73290f4d..70ccf364 100644 --- a/bootstrap/templates/kubernetes/apps/storage/kustomization.yaml.j2 +++ b/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 diff --git a/bootstrap/templates/kubernetes/apps/tools/kustomization.yaml.j2 b/bootstrap/templates/kubernetes/apps/tools/kustomization.yaml.j2 index 6a994d85..ac84e0b3 100644 --- a/bootstrap/templates/kubernetes/apps/tools/kustomization.yaml.j2 +++ b/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 diff --git a/bootstrap/templates/kubernetes/flux/config/cluster.yaml.j2 b/bootstrap/templates/kubernetes/flux/config/cluster.yaml.j2 index f4baa798..7b299b48 100644 --- a/bootstrap/templates/kubernetes/flux/config/cluster.yaml.j2 +++ b/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 diff --git a/bootstrap/templates/kubernetes/flux/vars/cluster-settings.yaml.j2 b/bootstrap/templates/kubernetes/flux/vars/cluster-settings.yaml.j2 index 759c9842..b7632dad 100644 --- a/bootstrap/templates/kubernetes/flux/vars/cluster-settings.yaml.j2 +++ b/bootstrap/templates/kubernetes/flux/vars/cluster-settings.yaml.j2 @@ -1,4 +1,3 @@ -#jinja2: trim_blocks: True, lstrip_blocks: True --- apiVersion: v1 kind: ConfigMap