feat: remove the need for raw jinja blocks (#1158)

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

bootstrap/templates/kubernetes/apps/network/cloudflared/app/secret.sops.yaml.j2

@@ -4,10 +4,10 @@ kind: Secret
 metadata:
   name: cloudflared-secret
 stringData:
-  TUNNEL_ID: "{{ bootstrap_cloudflare_tunnel_id }}"
+  TUNNEL_ID: "<< bootstrap_cloudflare_tunnel_id >>"
   credentials.json: |
     {
-      "AccountTag": "{{ bootstrap_cloudflare_account_tag }}",
-      "TunnelSecret": "{{ bootstrap_cloudflare_tunnel_secret }}",
-      "TunnelID": "{{ bootstrap_cloudflare_tunnel_id }}"
+      "AccountTag": "<< bootstrap_cloudflare_account_tag >>",
+      "TunnelSecret": "<< bootstrap_cloudflare_tunnel_secret >>",
+      "TunnelID": "<< bootstrap_cloudflare_tunnel_id >>"
     }

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

@@ -71,14 +71,14 @@ spec:
         className: external
         annotations:
           external-dns.alpha.kubernetes.io/target: "external.${SECRET_DOMAIN}"
-          {% if homepage.enabled | default(false) %}
+          <% if homepage.enabled | default(false) %>
           gethomepage.dev/enabled: "true"
           gethomepage.dev/group: Network
           gethomepage.dev/name: Echo Server
           gethomepage.dev/icon: mdi-video-input-antenna
-          {% endif %}
+          <% endif %>
         hosts:
-          - host: &host "{% raw %}{{ .Release.Name }}{% endraw %}.${SECRET_DOMAIN}"
+          - host: &host "{{ .Release.Name }}.${SECRET_DOMAIN}"
             paths:
               - path: /
                 service:

bootstrap/templates/kubernetes/apps/network/external-dns/app/secret.sops.yaml.j2

@@ -4,4 +4,4 @@ kind: Secret
 metadata:
   name: external-dns-secret
 stringData:
-  api-token: "{{ bootstrap_cloudflare_token }}"
+  api-token: "<< bootstrap_cloudflare_token >>"

bootstrap/templates/kubernetes/apps/network/k8s-gateway/app/helmrelease.yaml.j2

@@ -31,5 +31,5 @@ spec:
       type: LoadBalancer
       port: 53
       annotations:
-        io.cilium/lb-ipam-ips: "{{ bootstrap_k8s_gateway_addr }}"
+        io.cilium/lb-ipam-ips: "<< bootstrap_k8s_gateway_addr >>"
       externalTrafficPolicy: Cluster

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

@@ -3,6 +3,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ./staging.yaml
-  {% if bootstrap_acme_production_enabled | default(false) %}
+  <% if bootstrap_acme_production_enabled | default(false) %>
   - ./production.yaml
-  {% endif %}
+  <% endif %>

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

@@ -33,7 +33,7 @@ spec:
       service:
         annotations:
           external-dns.alpha.kubernetes.io/hostname: "external.${SECRET_DOMAIN}"
-          io.cilium/lb-ipam-ips: "{{ bootstrap_external_ingress_addr }}"
+          io.cilium/lb-ipam-ips: "<< bootstrap_external_ingress_addr >>"
         externalTrafficPolicy: Cluster
       ingressClassResource:
         name: external
@@ -71,11 +71,11 @@ spec:
           namespaceSelector:
             any: true
       extraArgs:
-        {% if bootstrap_acme_production_enabled | default(false) %}
+        <% if bootstrap_acme_production_enabled | default(false) %>
         default-ssl-certificate: "network/${SECRET_DOMAIN/./-}-production-tls"
-        {% else %}
+        <% else %>
         default-ssl-certificate: "network/${SECRET_DOMAIN/./-}-staging-tls"
-        {% endif %}
+        <% endif %>
       topologySpreadConstraints:
         - maxSkew: 1
           topologyKey: kubernetes.io/hostname

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

@@ -31,7 +31,7 @@ spec:
       service:
         annotations:
           external-dns.alpha.kubernetes.io/hostname: "internal.${SECRET_DOMAIN}"
-          io.cilium/lb-ipam-ips: "{{ bootstrap_internal_ingress_addr }}"
+          io.cilium/lb-ipam-ips: "<< bootstrap_internal_ingress_addr >>"
         externalTrafficPolicy: Cluster
       ingressClassResource:
         name: internal
@@ -69,11 +69,11 @@ spec:
           namespaceSelector:
             any: true
       extraArgs:
-        {% if bootstrap_acme_production_enabled | default(false) %}
+        <% if bootstrap_acme_production_enabled | default(false) %>
         default-ssl-certificate: "network/${SECRET_DOMAIN/./-}-production-tls"
-        {% else %}
+        <% else %>
         default-ssl-certificate: "network/${SECRET_DOMAIN/./-}-staging-tls"
-        {% endif %}
+        <% endif %>
       topologySpreadConstraints:
         - maxSkew: 1
           topologyKey: kubernetes.io/hostname