feat(yaskfile): updates and reorganizations (#1607)

bootstrap/scripts/validation.py

@@ -81,7 +81,7 @@ def validate_cli_tools(cloudflare: dict, **_) -> None:
             raise ValueError(f"Missing required CLI tool {tool}")
 
 
-@required("bootstrap_sops_age_pubkey")
+@required("bootstrap_age_pubkey")
 def validate_age(key: str, **_) -> None:
     if not re.match(r"^age1[a-z0-9]{0,58}$", key):
         raise ValueError(f"Invalid Age public key {key}")

bootstrap/templates/.sops.yaml.j2

@@ -4,9 +4,9 @@ creation_rules:
     path_regex: talos/.*\.sops\.ya?ml
     key_groups:
       - age:
-          - "#{ bootstrap_sops_age_pubkey }#"
+          - "#{ bootstrap_age_pubkey }#"
   - path_regex: kubernetes/.*\.sops\.ya?ml
     encrypted_regex: "^(data|stringData)$"
     key_groups:
       - age:
-          - "#{ bootstrap_sops_age_pubkey }#"
+          - "#{ bootstrap_age_pubkey }#"

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

@@ -30,10 +30,10 @@ spec:
         annotations:
           external-dns.alpha.kubernetes.io/hostname: "external.${SECRET_DOMAIN}"
           lbipam.cilium.io/ips: "#{ bootstrap_cloudflare.tunnel.ingress_vip }#"
-        #% if bootstrap_loadbalancer_mode in ['dsr']  %#
-        externalTrafficPolicy: Cluster
-        #% else %#
+        #% if bgp.enabled %#
         externalTrafficPolicy: Local
+        #% else %#
+        externalTrafficPolicy: Cluster
         #% endif %#
       ingressClassResource:
         name: external

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

@@ -27,10 +27,10 @@ spec:
       service:
         annotations:
           lbipam.cilium.io/ips: "#{ bootstrap_cloudflare.ingress_vip }#"
-        #% if bootstrap_loadbalancer_mode in ['dsr']  %#
-        externalTrafficPolicy: Cluster
-        #% else %#
+        #% if bgp.enabled %#
         externalTrafficPolicy: Local
+        #% else %#
+        externalTrafficPolicy: Cluster
         #% endif %#
       ingressClassResource:
         name: internal

bootstrap/templates/kubernetes/apps/network/k8s-gateway/app/helmrelease.yaml.j2

@@ -29,9 +29,9 @@ spec:
       port: 53
       annotations:
         lbipam.cilium.io/ips: "#{ bootstrap_cloudflare.gateway_vip }#"
-      #% if bootstrap_loadbalancer_mode in ['dsr']  %#
-      externalTrafficPolicy: Cluster
-      #% else %#
+      #% if bgp.enabled %#
       externalTrafficPolicy: Local
+      #% else %#
+      externalTrafficPolicy: Cluster
       #% endif %#
     watchedResources: ["Ingress", "Service"]