feat: refactor config file (#1267)

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

bootstrap/templates/partials/cilium-values-full.partial.yaml.j2

@@ -8,13 +8,14 @@ cluster:
   id: 1
 containerRuntime:
   integration: containerd
-  #% if bootstrap_distribution in ['k3s'] %#
+  #% if distribution in ['k3s'] %#
   socketPath: /var/run/k3s/containerd/containerd.sock
-  #% elif bootstrap_distribution in ['k0s'] %#
+  #% elif distribution in ['k0s'] %#
   socketPath: /var/run/k0s/containerd.sock
   #% endif %#
 endpointRoutes:
   enabled: true
+#% if cloudflare.enabled %#
 hubble:
   enabled: true
   metrics:
@@ -49,28 +50,32 @@ hubble:
       tls:
         - hosts:
             - "hubble.${SECRET_DOMAIN}"
+#% else %#
+hubble:
+  enabled: false
+#% endif %#
 ipam:
   mode: kubernetes
 ipv4NativeRoutingCIDR: "${CLUSTER_CIDR}"
-#% if bootstrap_advanced_flags.dual_stack_ipv4_first|default(false) %#
+#% if feature_gates.dual_stack_ipv4_first %#
 ipv6NativeRoutingCIDR: "${CLUSTER_CIDR_V6}"
 ipv6:
   enabled: true
 #% endif %#
-#% if bootstrap_distribution in ['k3s'] %#
+#% if distribution in ['k3s'] %#
 k8sServiceHost: 127.0.0.1
 k8sServicePort: 6444
-#% elif bootstrap_distribution in ['k0s'] %#
+#% elif distribution in ['k0s'] %#
 k8sServiceHost: localhost
 k8sServicePort: 7443
-#% elif bootstrap_distribution in ['talos'] %#
+#% elif distribution in ['talos'] %#
 k8sServiceHost: 127.0.0.1
 k8sServicePort: 7445
 #% endif %#
 kubeProxyReplacement: true
 kubeProxyReplacementHealthzBindAddr: 0.0.0.0:10256
 l2announcements:
-  #% if bootstrap_advanced_flags.dual_stack_ipv4_first|default(false) %#
+  #% if feature_gates.dual_stack_ipv4_first %#
   # https://github.com/cilium/cilium/issues/28985
   enabled: false
   #% else %#
@@ -87,23 +92,6 @@ localRedirectPolicy: true
 operator:
   replicas: 1
   rollOutPods: true
-  prometheus:
-    enabled: true
-    serviceMonitor:
-      enabled: true
-  dashboards:
-    enabled: true
-    annotations:
-      grafana_folder: Cilium
-prometheus:
-  enabled: true
-  serviceMonitor:
-    enabled: true
-    trustCRDsExist: true
-dashboards:
-  enabled: true
-  annotations:
-    grafana_folder: Cilium
 rollOutCiliumPods: true
 routingMode: native
 securityContext:

bootstrap/templates/partials/cilium-values-init.partial.yaml.j2

@@ -8,9 +8,9 @@ cluster:
   id: 1
 containerRuntime:
   integration: containerd
-  #% if bootstrap_distribution in ['k3s'] %#
+  #% if distribution in ['k3s'] %#
   socketPath: /var/run/k3s/containerd/containerd.sock
-  #% elif bootstrap_distribution in ['k0s'] %#
+  #% elif distribution in ['k0s'] %#
   socketPath: /var/run/k0s/containerd.sock
   #% endif %#
 endpointRoutes:
@@ -19,26 +19,26 @@ hubble:
   enabled: false
 ipam:
   mode: kubernetes
-ipv4NativeRoutingCIDR: "#{ bootstrap_cluster_cidr }#"
-#% if bootstrap_advanced_flags.dual_stack_ipv4_first|default(false) %#
-ipv6NativeRoutingCIDR: "#{ bootstrap_cluster_cidr_v6 }#"
+ipv4NativeRoutingCIDR: "#{ cluster.pod_network }#"
+#% if feature_gates.dual_stack_ipv4_first %#
+ipv6NativeRoutingCIDR: "#{ cluster.pod_network_v6 }#"
 ipv6:
   enabled: true
 #% endif %#
-#% if bootstrap_distribution in ['k3s'] %#
+#% if distribution in ['k3s'] %#
 k8sServiceHost: 127.0.0.1
 k8sServicePort: 6444
-#% elif bootstrap_distribution in ['k0s'] %#
+#% elif distribution in ['k0s'] %#
 k8sServiceHost: localhost
 k8sServicePort: 7443
-#% elif bootstrap_distribution in ['talos'] %#
+#% elif distribution in ['talos'] %#
 k8sServiceHost: 127.0.0.1
 k8sServicePort: 7445
 #% endif %#
 kubeProxyReplacement: true
 kubeProxyReplacementHealthzBindAddr: 0.0.0.0:10256
 l2announcements:
-  #% if bootstrap_advanced_flags.dual_stack_ipv4_first|default(false) %#
+  #% if feature_gates.dual_stack_ipv4_first %#
   # https://github.com/cilium/cilium/issues/28985
   enabled: false
   #% else %#

bootstrap/templates/partials/kube-vip-ds.partial.yaml.j2

@@ -21,7 +21,7 @@ spec:
           args: ["manager"]
           env:
             - name: address
-              value: "#{ bootstrap_kube_api_addr }#"
+              value: "#{ cluster.endpoint_vip }#"
             - name: vip_arp
               value: "true"
             - name: lb_enable

bootstrap/templates/partials/kubelet-csr-approver-values.partial.yaml.j2

@@ -1,2 +1,2 @@
-providerRegex: ^(#{ (bootstrap_nodes.master + bootstrap_nodes.worker|default([])) | map(attribute='name') | join('|') }#)$
+providerRegex: ^(#{ (nodes | map(attribute='name') | join('|')) }#)$
 bypassDnsResolution: true