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/ansible/inventory/group_vars/kubernetes/main.yaml.j2

@@ -2,7 +2,7 @@
 k3s_become: true
 k3s_etcd_datastore: true
 k3s_install_hard_links: true
-k3s_registration_address: "#{ cluster.endpoint_vip }#"
+k3s_registration_address: "{{ cluster.endpoint_vip }}"
 # renovate: datasource=github-releases depName=k3s-io/k3s
 k3s_release_version: v1.29.0+k3s1
 k3s_server_manifests_templates:

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

@@ -1,13 +1,13 @@
 ---
 k3s_control_node: true
 k3s_server:
-  #% if feature_gates.dual_stack_ipv4_first %#
-  cluster-cidr: "#{ cluster.pod_network.split(',')[0] }#,#{ cluster.pod_network.split(',')[1] }#"
-  service-cidr: "#{ cluster.service_network.split(',')[0] }#,#{ cluster.service_network.split(',')[1] }#"
-  #% else %#
-  cluster-cidr: "#{ cluster.pod_network }#"
-  service-cidr: "#{ cluster.service_network }#"
-  #% endif %#
+  {% if feature_gates.dual_stack_ipv4_first %}
+  cluster-cidr: "{{ cluster.pod_network.split(',')[0] }},{{ cluster.pod_network.split(',')[1] }}"
+  service-cidr: "{{ cluster.service_network.split(',')[0] }},{{ cluster.service_network.split(',')[1] }}"
+  {% else %}
+  cluster-cidr: "{{ cluster.pod_network }}"
+  service-cidr: "{{ cluster.service_network }}"
+  {% endif %}
   disable: ["flannel", "local-storage", "metrics-server", "servicelb", "traefik"]
   disable-cloud-controller: true
   disable-kube-proxy: true
@@ -24,16 +24,16 @@ k3s_server:
   kubelet-arg:
     - "image-gc-high-threshold=55"
     - "image-gc-low-threshold=50"
-  #% if feature_gates.dual_stack_ipv4_first %#
-  node-ip: "{{ ansible_host }},{{ ansible_default_ipv6.address }}"
-  #% else %#
-  node-ip: "{{ ansible_host }}"
-  #% endif %#
+  {% if feature_gates.dual_stack_ipv4_first %}
+  node-ip: "{% raw %}{{ ansible_host }}{% endraw %},{% raw %}{{ ansible_default_ipv6.address }}{% endraw %}"
+  {% else %}
+  node-ip: "{% raw %}{{ ansible_host }}{% endraw %}"
+  {% endif %}
   pause-image: registry.k8s.io/pause:3.9
   secrets-encryption: true
   tls-san:
-    - "#{ cluster.endpoint_vip }#"
-    #% for item in cluster.tls_sans %#
+    - "{{ cluster.endpoint_vip }}"
+    {% for item in cluster.tls_sans %}
     - "{{ item }}"
-    #% endfor %#
+    {% endfor %}
   write-kubeconfig-mode: "644"

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

@@ -4,9 +4,9 @@ k3s_agent:
   kubelet-arg:
     - "image-gc-high-threshold=55"
     - "image-gc-low-threshold=50"
-  #% if feature_gates.dual_stack_ipv4_first %#
-  node-ip: "{{ ansible_host }},{{ ansible_default_ipv6.address }}"
-  #% else %#
-  node-ip: "{{ ansible_host }}"
-  #% endif %#
+  {% if feature_gates.dual_stack_ipv4_first %}
+  node-ip: "{% raw %}{{ ansible_host }}{% endraw %},{% raw %}{{ ansible_default_ipv6.address }}{% endraw %}"
+  {% else %}
+  node-ip: "{% raw %}{{ ansible_host }}{% endraw %}"
+  {% endif %}
   pause-image: registry.k8s.io/pause:3.9

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

@@ -3,21 +3,21 @@ kubernetes:
   children:
     master:
       hosts:
-        #% for item in cluster.nodes.inventory %#
-        #% if item.controller %#
-        "#{ item.name }#":
-          ansible_user: "#{ item.ssh_username }#"
-          ansible_host: "#{ item.address }#"
-        #% endif %#
-        #% endfor %#
-    #% if cluster.nodes.inventory | selectattr('controller', 'equalto', False) | list | length %#
+        {% for item in cluster.nodes.inventory %}
+        {% if item.controller %}
+        "{{ item.name }}":
+          ansible_user: "{{ item.ssh_username }}"
+          ansible_host: "{{ item.address }}"
+        {% endif %}
+        {% endfor %}
+    {% if cluster.nodes.inventory | selectattr('controller', 'equalto', False) | list | length %}
     worker:
       hosts:
-        #% for item in cluster.nodes.inventory %#
-        #% if not item.controller %#
-        "#{ item.name }#":
-          ansible_user: "#{ item.ssh_username }#"
-          ansible_host: "#{ item.address }#"
-        #% endif %#
-        #% endfor %#
-    #% endif %#
+        {% for item in cluster.nodes.inventory %}
+        {% if not item.controller %}
+        "{{ item.name }}":
+          ansible_user: "{{ item.ssh_username }}"
+          ansible_host: "{{ item.address }}"
+        {% endif %}
+        {% endfor %}
+    {% endif %}