feat: update jinja delimiters back to default (#1269)

* feat: update jinja delimiters back to default

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

* feat: remove cert-manager promrules

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

* fix: update talos csr approver

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

---------

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: "#{ cloudflare.tunnel.id }#"
+  TUNNEL_ID: "{{ cloudflare.tunnel.id }}"
   credentials.json: |
     {
-      "AccountTag": "#{ cloudflare.tunnel.account_id }#",
-      "TunnelSecret": "#{ cloudflare.tunnel.secret }#",
-      "TunnelID": "#{ cloudflare.tunnel.id }#"
+      "AccountTag": "{{ cloudflare.tunnel.account_id }}",
+      "TunnelSecret": "{{ cloudflare.tunnel.secret }}",
+      "TunnelID": "{{ cloudflare.tunnel.id }}"
     }

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

@@ -70,7 +70,7 @@ spec:
         annotations:
           external-dns.alpha.kubernetes.io/target: "external.${SECRET_DOMAIN}"
         hosts:
-          - host: &host "{{ .Release.Name }}-external.${SECRET_DOMAIN}"
+          - host: &host "{% raw %}{{ .Release.Name }}{% endraw %}-external.${SECRET_DOMAIN}"
             paths:
               - path: /
                 service:
@@ -83,7 +83,7 @@ spec:
         enabled: true
         className: internal
         hosts:
-          - host: &host "{{ .Release.Name }}-internal.${SECRET_DOMAIN}"
+          - host: &host "{% raw %}{{ .Release.Name }}{% endraw %}-internal.${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: "#{ cloudflare.token }#"
+  api-token: "{{ cloudflare.token }}"

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

@@ -3,6 +3,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ./staging.yaml
-  #% if cloudflare.acme.production %#
+  {% if cloudflare.acme.production %}
   - ./production.yaml
-  #% endif %#
+  {% endif %}

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

@@ -32,7 +32,7 @@ spec:
       service:
         annotations:
           external-dns.alpha.kubernetes.io/hostname: "external.${SECRET_DOMAIN}"
-          io.cilium/lb-ipam-ips: "#{ cloudflare.tunnel.ingress_vip }#"
+          io.cilium/lb-ipam-ips: "{{ cloudflare.tunnel.ingress_vip }}"
         externalTrafficPolicy: Cluster
       ingressClassResource:
         name: external
@@ -64,11 +64,11 @@ spec:
         proxy-buffer-size: 16k
         ssl-protocols: TLSv1.3 TLSv1.2
       extraArgs:
-        #% if cloudflare.acme.production %#
+        {% if cloudflare.acme.production %}
         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/ingress-nginx/internal/helmrelease.yaml.j2

@@ -29,7 +29,7 @@ spec:
       replicaCount: 1
       service:
         annotations:
-          io.cilium/lb-ipam-ips: "#{ cloudflare.ingress_vip }#"
+          io.cilium/lb-ipam-ips: "{{ cloudflare.ingress_vip }}"
         externalTrafficPolicy: Cluster
       ingressClassResource:
         name: internal
@@ -61,11 +61,11 @@ spec:
         proxy-buffer-size: 16k
         ssl-protocols: TLSv1.3 TLSv1.2
       extraArgs:
-        #% if cloudflare.acme.production %#
+        {% if cloudflare.acme.production %}
         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/k8s-gateway/app/helmrelease.yaml.j2

@@ -30,5 +30,5 @@ spec:
       type: LoadBalancer
       port: 53
       annotations:
-        io.cilium/lb-ipam-ips: "#{ cloudflare.gateway_vip }#"
+        io.cilium/lb-ipam-ips: "{{ cloudflare.gateway_vip }}"
       externalTrafficPolicy: Cluster