feat: more changes to templating (#1218)

* feat: clean up more jinja default references

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

* feat: add additional tls sans force kube-vip on k3s

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

---------

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

.github/tests/config-k0s.yaml

@@ -17,7 +17,7 @@ bootstrap_cloudflare_tunnel_secret: fake
 bootstrap_cloudflare_tunnel_id: fake
 bootstrap_node_cidr: 10.10.10.0/24
 bootstrap_kube_api_addr: 10.10.10.254
-bootstrap_kube_api_hostname: fake
+bootstrap_kube_additional_tls_sans: ["fake"]
 bootstrap_k8s_gateway_addr: 10.10.10.253
 bootstrap_external_ingress_addr: 10.10.10.252
 bootstrap_internal_ingress_addr: 10.10.10.251

.github/tests/config-k3s-ipv4.yaml

@@ -17,7 +17,7 @@ bootstrap_cloudflare_tunnel_secret: fake
 bootstrap_cloudflare_tunnel_id: fake
 bootstrap_node_cidr: 10.10.10.0/24
 bootstrap_kube_api_addr: 10.10.10.254
-bootstrap_kube_api_hostname: fake
+bootstrap_kube_additional_tls_sans: ["fake"]
 bootstrap_k8s_gateway_addr: 10.10.10.253
 bootstrap_external_ingress_addr: 10.10.10.252
 bootstrap_internal_ingress_addr: 10.10.10.251

.github/tests/config-k3s-ipv6.yaml

@@ -17,7 +17,7 @@ bootstrap_cloudflare_tunnel_secret: fake
 bootstrap_cloudflare_tunnel_id: fake
 bootstrap_node_cidr: 10.10.10.0/24
 bootstrap_kube_api_addr: 10.10.10.254
-bootstrap_kube_api_hostname: fake
+bootstrap_kube_additional_tls_sans: ["fake"]
 bootstrap_k8s_gateway_addr: 10.10.10.253
 bootstrap_external_ingress_addr: 10.10.10.252
 bootstrap_internal_ingress_addr: 10.10.10.251

.github/tests/config-k3s-no-kube-vip.yaml

@@ -1,32 +0,0 @@
----
-skip_tests: true
-
-bootstrap_distribution: k3s
-bootstrap_github_username: onedr0p
-bootstrap_github_repository_name: flux-cluster-template
-bootstrap_github_repository_branch: main
-bootstrap_age_public_key: $BOOTSTRAP_AGE_PUBLIC_KEY
-bootstrap_timezone: Etc/UTC
-bootstrap_acme_email: fake
-bootstrap_acme_production_enabled: false
-bootstrap_flux_github_webhook_token: fake
-bootstrap_cloudflare_domain: fake
-bootstrap_cloudflare_token: fake
-bootstrap_cloudflare_account_tag: fake
-bootstrap_cloudflare_tunnel_secret: fake
-bootstrap_cloudflare_tunnel_id: fake
-bootstrap_node_cidr: 10.10.10.0/24
-bootstrap_kube_api_addr: # left blank to not use kube-vip
-bootstrap_kube_api_hostname: fake
-bootstrap_k8s_gateway_addr: 10.10.10.253
-bootstrap_external_ingress_addr: 10.10.10.252
-bootstrap_internal_ingress_addr: 10.10.10.251
-bootstrap_dns_server: 1.1.1.1
-bootstrap_ipv6_enabled: false
-bootstrap_cluster_cidr: 10.42.0.0/16
-bootstrap_service_cidr: 10.43.0.0/16
-bootstrap_nodes:
-  master:
-    - name: k8s-0
-      address: 10.10.10.100
-      username: fake

.github/tests/config-talos.yaml

@@ -17,7 +17,7 @@ bootstrap_cloudflare_tunnel_secret: fake
 bootstrap_cloudflare_tunnel_id: fake
 bootstrap_node_cidr: 10.10.10.0/24
 bootstrap_kube_api_addr: 10.10.10.254
-bootstrap_kube_api_hostname: fake
+bootstrap_kube_additional_tls_sans: ["fake"]
 bootstrap_k8s_gateway_addr: 10.10.10.253
 bootstrap_external_ingress_addr: 10.10.10.252
 bootstrap_internal_ingress_addr: 10.10.10.251

.github/workflows/e2e.yaml

@@ -40,7 +40,6 @@ jobs:
           - k0s
           - k3s-ipv4
           - k3s-ipv6
-          - k3s-no-kube-vip
           - talos
         addon-files: ["addons"]
     steps: