chore: update logic in cilium helmchart and var ordering

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

bootstrap/tasks/validation/vars.yaml

@@ -6,23 +6,24 @@
     success_msg: Required bootstrap var {{ item }} exists and is defined
     fail_msg: Required bootstrap var {{ item }} does not exists or is not defined
   loop:
-    - bootstrap_github_username
-    - bootstrap_github_repository_name
-    - bootstrap_age_public_key
-    - bootstrap_timezone
     - bootstrap_acme_email
-    - bootstrap_flux_github_webhook_token
+    - bootstrap_age_public_key
+    - bootstrap_cloudflare_account_tag
     - bootstrap_cloudflare_domain
     - bootstrap_cloudflare_token
-    - bootstrap_cloudflare_account_tag
-    - bootstrap_cloudflare_tunnel_secret
     - bootstrap_cloudflare_tunnel_id
-    - bootstrap_node_cidr
-    - bootstrap_k8s_gateway_addr
-    - bootstrap_ingress_nginx_addr
-    - bootstrap_kube_vip_addr
+    - bootstrap_cloudflare_tunnel_secret
     - bootstrap_cluster_cidr
+    - bootstrap_flux_github_webhook_token
+    - bootstrap_github_repository_name
+    - bootstrap_github_username
+    - bootstrap_ingress_nginx_addr
+    - bootstrap_ipv6_enabled
+    - bootstrap_k8s_gateway_addr
+    - bootstrap_kube_vip_addr
+    - bootstrap_node_cidr
     - bootstrap_service_cidr
+    - bootstrap_timezone
 
 - name: Verify bootstrap node names are valid
   ansible.builtin.assert:

bootstrap/templates/ansible/playbooks/templates/custom-coredns-helmchart.yaml.j2.j2

@@ -20,11 +20,7 @@ spec:
     service:
       name: kube-dns
       # Choose the 10th IP address from the start of the service-cidr
-      {% if bootstrap_ipv6_enabled | default(false) %}
       clusterIP: "{% raw %}{{ k3s_server['service-cidr'].split(',')[0] | ansible.utils.nthhost(10) }}{% endraw %}"
-      {% else %}
-      clusterIP: "{% raw %}{{ k3s_server['service-cidr'] | ansible.utils.nthhost(10) }}{% endraw %}"
-      {% endif %}
     serviceAccount:
       create: true
     deployment: