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

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

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

@@ -1,4 +1,4 @@
-{% if bootstrap_distribution == 'k3s' %}
+<% if bootstrap_distribution == 'k3s' %>
 ---
 #
 # Below vars are for the xanmanning.k3s role
@@ -9,17 +9,17 @@
 k3s_release_version: "v1.29.0+k3s1"
 k3s_install_hard_links: true
 k3s_become: true
-{% if bootstrap_nodes.master | length > 1 %}
+<% if bootstrap_nodes.master | length > 1 %>
 k3s_etcd_datastore: true
-{% else %}
+<% else %>
 k3s_etcd_datastore: false
-{% endif %}
-k3s_registration_address: "{% raw %}{{ kube_api_addr }}{% endraw %}"
+<% endif %>
+k3s_registration_address: "{{ kube_api_addr }}"
 # /var/lib/rancher/k3s/server/manifests
 k3s_server_manifests_templates:
   - custom-cilium-helmchart.yaml.j2
   - custom-coredns-helmchart.yaml.j2
-{% if bootstrap_nodes.master | length > 1 and not bootstrap_kube_api_addr %}
+<% if bootstrap_nodes.master | length > 1 and not bootstrap_kube_api_addr %>
 # /var/lib/rancher/k3s/server/manifests
 k3s_server_manifests_urls:
   - url: https://raw.githubusercontent.com/kube-vip/website/main/content/manifests/rbac.yaml
@@ -27,5 +27,5 @@ k3s_server_manifests_urls:
 # /var/lib/rancher/k3s/agent/pod-manifests
 k3s_server_pod_manifests_templates:
   - kube-vip-static-pod.yaml.j2
-{% endif %}
-{% endif %}
+<% endif %>
+<% endif %>

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

@@ -1,16 +1,16 @@
 ---
-timezone: "{{ bootstrap_timezone }}"
-github_username: "{{ bootstrap_github_username }}"
-coredns_addr: "{{ bootstrap_service_cidr.split(',')[0] | nthhost(10) }}"
-{% if bootstrap_nodes.master | length == 1 and not bootstrap_kube_api_addr %}
-kube_api_addr: "{{ bootstrap_nodes.master[0].address }}"
-{% else %}
-kube_api_addr: "{{ bootstrap_kube_api_addr }}"
-{% endif %}
-cluster_cidr: "{{ bootstrap_cluster_cidr.split(',')[0] }}"
-service_cidr: "{{ bootstrap_service_cidr.split(',')[0] }}"
-node_cidr: "{{ bootstrap_node_cidr }}"
-{% if bootstrap_ipv6_enabled | default(false) %}
-cluster_cidr_v6: "{{ bootstrap_cluster_cidr.split(',')[1] }}"
-service_cidr_v6: "{{ bootstrap_service_cidr.split(',')[1] }}"
-{% endif %}
+timezone: "<< bootstrap_timezone >>"
+github_username: "<< bootstrap_github_username >>"
+coredns_addr: "<< bootstrap_service_cidr.split(',')[0] | nthhost(10) >>"
+<% if bootstrap_nodes.master | length == 1 and not bootstrap_kube_api_addr %>
+kube_api_addr: "<< bootstrap_nodes.master[0].address >>"
+<% else %>
+kube_api_addr: "<< bootstrap_kube_api_addr >>"
+<% endif %>
+cluster_cidr: "<< bootstrap_cluster_cidr.split(',')[0] >>"
+service_cidr: "<< bootstrap_service_cidr.split(',')[0] >>"
+node_cidr: "<< bootstrap_node_cidr >>"
+<% if bootstrap_ipv6_enabled | default(false) %>
+cluster_cidr_v6: "<< bootstrap_cluster_cidr.split(',')[1] >>"
+service_cidr_v6: "<< bootstrap_service_cidr.split(',')[1] >>"
+<% endif %>