feat: change jinja block/start delimiters for renovate support (#1163)

* feat: change jinja block/start delimiters for renovate support

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

* fix: update renovate config an helm repos

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

---------

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

bootstrap/templates/kubernetes/apps/kube-system/cilium/app/helmrelease.yaml.j2

@@ -34,11 +34,11 @@ spec:
       id: 1
     containerRuntime:
       integration: containerd
-      <% if bootstrap_distribution == "k3s" %>
+      #% if bootstrap_distribution == "k3s" %#
       socketPath: /var/run/k3s/containerd/containerd.sock
-      <% else %>
+      #% elif bootstrap_distribution == "k0s" %#
       socketPath: /var/run/k0s/containerd.sock
-      <% endif %>
+      #% endif %#
     endpointRoutes:
       enabled: true
     hubble:
@@ -70,13 +70,13 @@ spec:
         ingress:
           enabled: true
           className: internal
-          <% if homepage.enabled | default(false) %>
+          #% if homepage.enabled | default(false) %#
           annotations:
             gethomepage.dev/enabled: "true"
             gethomepage.dev/group: Network
             gethomepage.dev/name: Cilium
             gethomepage.dev/icon: cilium.png
-          <% endif %>
+          #% endif %#
           hosts:
             - "hubble.${SECRET_DOMAIN}"
           tls:
@@ -85,28 +85,28 @@ spec:
     ipam:
       mode: kubernetes
     ipv4NativeRoutingCIDR: "${CLUSTER_CIDR}"
-    <% if bootstrap_ipv6_enabled | default(false) %>
+    #% if bootstrap_ipv6_enabled | default(false) %#
     ipv6NativeRoutingCIDR: "${CLUSTER_CIDR_V6}"
     ipv6:
       enabled: true
-    <% endif %>
+    #% endif %#
     k8sServiceHost: "${KUBE_API_ADDR}"
     k8sServicePort: 6443
     kubeProxyReplacement: true
     kubeProxyReplacementHealthzBindAddr: 0.0.0.0:10256
     l2announcements:
-      <% if bootstrap_ipv6_enabled | default(false) %>
+      #% if bootstrap_ipv6_enabled | default(false) %#
       enabled: false
-      <% else %>
+      #% else %#
       enabled: true
       # https://github.com/cilium/cilium/issues/26586
       leaseDuration: 120s
       leaseRenewDeadline: 60s
       leaseRetryPeriod: 1s
-      <% endif %>
+      #% endif %#
     loadBalancer:
       algorithm: maglev
-      mode: << bootstrap_cilium_loadbalancer_mode | default('dsr', true) >>
+      mode: "{% bootstrap_cilium_loadbalancer_mode | default('dsr', true) %}"
     localRedirectPolicy: true
     operator:
       replicas: 1

bootstrap/templates/kubernetes/apps/kube-system/cilium/app/kustomization.yaml.j2

@@ -2,7 +2,7 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  <% if not bootstrap_ipv6_enabled | default(false) %>
+  #% if not bootstrap_ipv6_enabled | default(false) %#
   - ./cilium-l2.yaml
-  <% endif %>
+  #% endif %#
   - ./helmrelease.yaml

bootstrap/templates/kubernetes/apps/kube-system/coredns/app/helmrelease.yaml.j2

@@ -1,4 +1,4 @@
-<% if bootstrap_distribution == "k3s" %>
+#% if bootstrap_distribution == "k3s" %#
 ---
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
@@ -87,4 +87,4 @@ spec:
         labelSelector:
           matchLabels:
             app.kubernetes.io/instance: coredns
-<% endif %>
+#% endif %#

bootstrap/templates/kubernetes/apps/kube-system/coredns/app/kustomization.yaml.j2

@@ -1,7 +1,7 @@
-<% if bootstrap_distribution == "k3s" %>
+#% if bootstrap_distribution == "k3s" %#
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ./helmrelease.yaml
-<% endif %>
+#% endif %#

bootstrap/templates/kubernetes/apps/kube-system/coredns/ks.yaml.j2

@@ -1,4 +1,4 @@
-<% if bootstrap_distribution == "k3s" %>
+#% if bootstrap_distribution == "k3s" %#
 ---
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
@@ -19,4 +19,4 @@ spec:
   interval: 30m
   retryInterval: 1m
   timeout: 5m
-<% endif %>
+#% endif %#

bootstrap/templates/kubernetes/apps/kube-system/kustomization.yaml.j2

@@ -4,7 +4,7 @@ kind: Kustomization
 resources:
   - ./namespace.yaml
   - ./cilium/ks.yaml
-  <% if bootstrap_distribution == "k3s" %>
+  #% if bootstrap_distribution == "k3s" %#
   - ./coredns/ks.yaml
-  <% endif %>
+  #% endif %#
   - ./metrics-server/ks.yaml