feat: rename addon vars to addon_ prefix and simplify logic in jinj…

…a templates (#1216)

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

.github/tests/addons.yaml

@@ -1,29 +1,30 @@
 ---
-homepage:
+
+addon_homepage:
   enabled: true
 
-grafana:
+addon_grafana:
   enabled: true
   password: fake
 
-kube_prometheus_stack:
+addon_kube_prometheus_stack:
   enabled: true
 
-kubernetes_dashboard:
+addon_kubernetes_dashboard:
   enabled: true
 
-weave_gitops:
+addon_weave_gitops:
   enabled: true
   password: fake
 
-csi_driver_nfs:
+addon_csi_driver_nfs:
   enabled: true
   storage_class:
     - name: fake
       server: fake
       share: /fake
 
-csi_driver_smb:
+addon_csi_driver_smb:
   enabled: true
   storage_class:
     - name: fake1
@@ -61,18 +62,18 @@ csi_driver_smb:
       gid: 100
       existing_secret_namespace: fake
 
-system_upgrade_controller:
+addon_system_upgrade_controller:
   enabled: true
 
-discord_template_notifier:
+addon_discord_template_notifier:
   enabled: true
   webhook_url: https://discord.com/api/webhooks/fake/fake
 
-volsync:
+addon_volsync:
   enabled: true
 
-spegel:
+addon_spegel:
   enabled: true
 
-longhorn:
+addon_longhorn:
   enabled: true

bootstrap/templates/kubernetes/apps/default/discord-template-notifier/app/helmrelease.yaml.j2

@@ -1,4 +1,4 @@
-#% if discord_template_notifier|default({}) and discord_template_notifier.enabled|default(false) %#
+#% if addon_discord_template_notifier.enabled %#
 ---
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease

bootstrap/templates/kubernetes/apps/default/discord-template-notifier/app/kustomization.yaml.j2

@@ -1,4 +1,4 @@
-#% if discord_template_notifier|default({}) and discord_template_notifier.enabled|default(false) %#
+#% if addon_discord_template_notifier.enabled %#
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization

bootstrap/templates/kubernetes/apps/default/discord-template-notifier/app/secret.sops.yaml.j2

@@ -1,4 +1,4 @@
-#% if discord_template_notifier|default({}) and discord_template_notifier.enabled|default(false) %#
+#% if addon_discord_template_notifier.enabled %#
 ---
 apiVersion: v1
 kind: Secret

bootstrap/templates/kubernetes/apps/default/discord-template-notifier/ks.yaml.j2

@@ -1,4 +1,4 @@
-#% if discord_template_notifier|default({}) and discord_template_notifier.enabled|default(false) %#
+#% if addon_discord_template_notifier.enabled %#
 ---
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization

bootstrap/templates/kubernetes/apps/default/homepage/app/configmap.yaml.j2

@@ -1,4 +1,4 @@
-#% if homepage|default({}) and homepage.enabled|default(false) %#
+#% if addon_homepage.enabled %#
 ---
 apiVersion: v1
 kind: ConfigMap

bootstrap/templates/kubernetes/apps/default/homepage/app/helmrelease.yaml.j2

@@ -1,4 +1,4 @@
-#% if homepage|default({}) and homepage.enabled|default(false) %#
+#% if addon_homepage.enabled %#
 ---
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease

bootstrap/templates/kubernetes/apps/default/homepage/app/kustomization.yaml.j2

@@ -1,4 +1,4 @@
-#% if homepage|default({}) and homepage.enabled|default(false) %#
+#% if addon_homepage.enabled %#
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization

bootstrap/templates/kubernetes/apps/default/homepage/app/secret.sops.yaml.j2

@@ -1,4 +1,4 @@
-#% if homepage|default({}) and homepage.enabled|default(false) %#
+#% if addon_homepage.enabled %#
 ---
 apiVersion: v1
 kind: Secret

bootstrap/templates/kubernetes/apps/default/homepage/ks.yaml.j2

@@ -1,4 +1,4 @@
-#% if homepage|default({}) and homepage.enabled|default(false) %#
+#% if addon_homepage.enabled %#
 ---
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization

bootstrap/templates/kubernetes/apps/default/kustomization.yaml.j2

@@ -3,9 +3,9 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ./namespace.yaml
-  #% if homepage|default({}) and homepage.enabled|default(false) %#
+  #% if addon_homepage.enabled %#
   - ./homepage/ks.yaml
   #% endif %#
-  #% if discord_template_notifier|default({}) and discord_template_notifier.enabled|default(false) %#
+  #% if addon_discord_template_notifier.enabled %#
   - ./discord-template-notifier/ks.yaml
   #% endif %#

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

@@ -4,6 +4,6 @@ kind: Kustomization
 resources:
   - ./namespace.yaml
   - ./addons/ks.yaml
-  #% if weave_gitops|default({}) and weave_gitops.enabled|default(false) %#
+  #% if addon_weave_gitops.enabled %#
   - ./weave-gitops/ks.yaml
   #% endif %#

bootstrap/templates/kubernetes/apps/flux-system/weave-gitops/app/helmrelease.yaml.j2

@@ -1,4 +1,4 @@
-#% if weave_gitops|default({}) and weave_gitops.enabled|default(false) %#
+#% if addon_weave_gitops.enabled %#
 ---
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
@@ -31,7 +31,7 @@ spec:
     ingress:
       enabled: true
       className: internal
-      #% if homepage|default({}) and homepage.enabled|default(false) %#
+      #% if addon_homepage.enabled %#
       annotations:
         gethomepage.dev/enabled: "true"
         gethomepage.dev/group: Home

bootstrap/templates/kubernetes/apps/flux-system/weave-gitops/app/kustomization.yaml.j2

@@ -1,4 +1,4 @@
-#% if weave_gitops|default({}) and weave_gitops.enabled|default(false) %#
+#% if addon_weave_gitops.enabled %#
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization

bootstrap/templates/kubernetes/apps/flux-system/weave-gitops/app/secret.sops.yaml.j2

@@ -1,4 +1,4 @@
-#% if weave_gitops|default({}) and weave_gitops.enabled|default(false) %#
+#% if addon_weave_gitops.enabled %#
 ---
 apiVersion: v1
 kind: Secret
@@ -7,5 +7,5 @@ metadata:
 type: Opaque
 stringData:
   username: admin
-  password: "#{ weave_gitops.password | encrypt }#"
+  password: "#{ addon_weave_gitops.password | encrypt }#"
 #% endif %#

bootstrap/templates/kubernetes/apps/flux-system/weave-gitops/ks.yaml.j2

@@ -1,4 +1,4 @@
-#% if weave_gitops|default({}) and weave_gitops.enabled|default(false) %#
+#% if addon_weave_gitops.enabled %#
 ---
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization

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

@@ -1,4 +1,4 @@
-#% if bootstrap_distribution in ['k0s', 'k3s'] and longhorn|default({}) and longhorn.enabled|default(false) %#
+#% if bootstrap_distribution in ['k0s', 'k3s'] and addon_longhorn.enabled %#
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization

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

@@ -1,4 +1,4 @@
-#% if bootstrap_distribution in ['k0s', 'k3s'] and longhorn|default({}) and longhorn.enabled|default(false) %#
+#% if bootstrap_distribution in ['k0s', 'k3s'] and addon_longhorn.enabled %#
 ---
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease

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

@@ -1,4 +1,4 @@
-#% if bootstrap_distribution in ['k0s', 'k3s'] and longhorn|default({}) and longhorn.enabled|default(false) %#
+#% if bootstrap_distribution in ['k0s', 'k3s'] and addon_longhorn.enabled %#
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization

bootstrap/templates/kubernetes/apps/longhorn-system/longhorn/app/snapshot.yaml.j2

@@ -1,4 +1,4 @@
-#% if bootstrap_distribution in ['k0s', 'k3s'] and longhorn|default({}) and longhorn.enabled|default(false) %#
+#% if bootstrap_distribution in ['k0s', 'k3s'] and addon_longhorn.enabled %#
 ---
 apiVersion: storage.k8s.io/v1
 kind: StorageClass

bootstrap/templates/kubernetes/apps/longhorn-system/longhorn/ks.yaml.j2

@@ -1,4 +1,4 @@
-#% if bootstrap_distribution in ['k0s', 'k3s'] and longhorn|default({}) and longhorn.enabled|default(false) %#
+#% if bootstrap_distribution in ['k0s', 'k3s'] and addon_longhorn.enabled %#
 ---
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization

bootstrap/templates/kubernetes/apps/longhorn-system/namespace.yaml.j2

@@ -1,4 +1,4 @@
-#% if bootstrap_distribution in ['k0s', 'k3s'] and longhorn|default({}) and longhorn.enabled|default(false) %#
+#% if bootstrap_distribution in ['k0s', 'k3s'] and addon_longhorn.enabled %#
 ---
 apiVersion: v1
 kind: Namespace

bootstrap/templates/kubernetes/apps/network/echo-server/app/helmrelease.yaml.j2

@@ -70,7 +70,7 @@ spec:
         className: external
         annotations:
           external-dns.alpha.kubernetes.io/target: "external.${SECRET_DOMAIN}"
-          #% if homepage|default({}) and homepage.enabled|default(false) %#
+          #% if addon_homepage.enabled %#
           gethomepage.dev/enabled: "true"
           gethomepage.dev/group: Network
           gethomepage.dev/name: Echo Server

bootstrap/templates/kubernetes/apps/observability/grafana/app/helmrelease.yaml.j2

@@ -1,4 +1,4 @@
-#% if grafana|default({}) and grafana.enabled|default(false) %#
+#% if addon_grafana.enabled %#
 ---
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
@@ -159,7 +159,7 @@ spec:
     ingress:
       enabled: true
       ingressClassName: internal
-      #% if homepage|default({}) and homepage.enabled|default(false) %#
+      #% if addon_homepage.enabled %#
       annotations:
         gethomepage.dev/enabled: "true"
         gethomepage.dev/icon: grafana.png

bootstrap/templates/kubernetes/apps/observability/grafana/app/kustomization.yaml.j2

@@ -1,4 +1,4 @@
-#% if grafana|default({}) and grafana.enabled|default(false) %#
+#% if addon_grafana.enabled %#
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization

bootstrap/templates/kubernetes/apps/observability/grafana/app/secret.sops.yaml.j2

@@ -1,4 +1,4 @@
-#% if grafana|default({}) and grafana.enabled|default(false) %#
+#% if addon_grafana.enabled %#
 ---
 apiVersion: v1
 kind: Secret

bootstrap/templates/kubernetes/apps/observability/grafana/ks.yaml.j2

@@ -1,4 +1,4 @@
-#% if grafana|default({}) and grafana.enabled|default(false) %#
+#% if addon_grafana.enabled %#
 ---
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization

bootstrap/templates/kubernetes/apps/observability/kube-prometheus-stack/app/helmrelease.yaml.j2

@@ -1,4 +1,4 @@
-#% if kube_prometheus_stack|default({}) and kube_prometheus_stack.enabled|default(false) %#
+#% if addon_kube_prometheus_stack.enabled %#
 ---
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
@@ -121,7 +121,7 @@ spec:
       ingress:
         enabled: true
         ingressClassName: internal
-        #% if homepage|default({}) and homepage.enabled|default(false) %#
+        #% if addon_homepage.enabled %#
         annotations:
           gethomepage.dev/enabled: "true"
           gethomepage.dev/icon: prometheus.png

bootstrap/templates/kubernetes/apps/observability/kube-prometheus-stack/app/kustomization.yaml.j2

@@ -1,4 +1,4 @@
-#% if kube_prometheus_stack|default({}) and kube_prometheus_stack.enabled|default(false) %#
+#% if addon_kube_prometheus_stack.enabled %#
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization

bootstrap/templates/kubernetes/apps/observability/kube-prometheus-stack/ks.yaml.j2

@@ -1,4 +1,4 @@
-#% if kube_prometheus_stack|default({}) and kube_prometheus_stack.enabled|default(false) %#
+#% if addon_kube_prometheus_stack.enabled %#
 ---
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization

bootstrap/templates/kubernetes/apps/observability/kubernetes-dashboard/app/helmrelease.yaml.j2

@@ -1,4 +1,4 @@
-#% if kubernetes_dashboard|default({}) and kubernetes_dashboard.enabled|default(false) %#
+#% if addon_kubernetes_dashboard.enabled %#
 ---
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
@@ -31,7 +31,7 @@ spec:
     ingress:
       enabled: true
       className: internal
-      #% if homepage|default({}) and homepage.enabled|default(false) %#
+      #% if addon_homepage.enabled %#
       annotations:
         gethomepage.dev/enabled: "true"
         gethomepage.dev/icon: kubernetes-dashboard.png

bootstrap/templates/kubernetes/apps/observability/kubernetes-dashboard/app/kustomization.yaml.j2

@@ -1,4 +1,4 @@
-#% if kubernetes_dashboard|default({}) and kubernetes_dashboard.enabled|default(false) %#
+#% if addon_kubernetes_dashboard.enabled %#
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization

bootstrap/templates/kubernetes/apps/observability/kubernetes-dashboard/app/rbac.yaml.j2

@@ -1,4 +1,4 @@
-#% if kubernetes_dashboard|default({}) and kubernetes_dashboard.enabled|default(false) %#
+#% if addon_kubernetes_dashboard.enabled %#
 # For dashboard sign in token:
 # kubectl -n observability get secret kubernetes-dashboard -o jsonpath='{.data.token}' | base64 -d
 ---

bootstrap/templates/kubernetes/apps/observability/kubernetes-dashboard/ks.yaml.j2

@@ -1,4 +1,4 @@
-#% if kubernetes_dashboard|default({}) and kubernetes_dashboard.enabled|default(false) %#
+#% if addon_kubernetes_dashboard.enabled %#
 ---
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization

bootstrap/templates/kubernetes/apps/observability/kustomization.yaml.j2

@@ -3,12 +3,12 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ./namespace.yaml
-  #% if grafana|default({}) and grafana.enabled|default(false) %#
+  #% if addon_grafana.enabled %#
   - ./grafana/ks.yaml
   #% endif %#
-  #% if kube_prometheus_stack|default({}) and kube_prometheus_stack.enabled|default(false) %#
+  #% if addon_kube_prometheus_stack.enabled %#
   - ./kube-prometheus-stack/ks.yaml
   #% endif %#
-  #% if kubernetes_dashboard|default({}) and kubernetes_dashboard.enabled|default(false) %#
+  #% if addon_kubernetes_dashboard.enabled %#
   - ./kubernetes-dashboard/ks.yaml
   #% endif %#

bootstrap/templates/kubernetes/apps/storage/csi-driver-nfs/app/helmrelease.yaml.j2

@@ -1,4 +1,4 @@
-#% if csi_driver_nfs|default({}) and csi_driver_nfs.enabled|default(false) %#
+#% if addon_csi_driver_nfs.enabled %#
 ---
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease

bootstrap/templates/kubernetes/apps/storage/csi-driver-nfs/app/kustomization.yaml.j2

@@ -1,4 +1,4 @@
-#% if csi_driver_nfs|default({}) and csi_driver_nfs.enabled|default(false) %#
+#% if addon_csi_driver_nfs.enabled %#
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization

bootstrap/templates/kubernetes/apps/storage/csi-driver-nfs/app/storageclass.yaml.j2

@@ -1,5 +1,5 @@
-#% if csi_driver_nfs|default({}) and csi_driver_nfs.enabled|default(false) %#
-#% for item in csi_driver_nfs.storage_class %#
+#% if addon_csi_driver_nfs.enabled %#
+#% for item in addon_csi_driver_nfs.storage_class %#
 ---
 apiVersion: storage.k8s.io/v1
 kind: StorageClass

bootstrap/templates/kubernetes/apps/storage/csi-driver-nfs/ks.yaml.j2

@@ -1,4 +1,4 @@
-#% if csi_driver_nfs|default({}) and csi_driver_nfs.enabled|default(false) %#
+#% if addon_csi_driver_nfs.enabled %#
 ---
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization

bootstrap/templates/kubernetes/apps/storage/csi-driver-smb/app/helmrelease.yaml.j2

@@ -1,4 +1,4 @@
-#% if csi_driver_smb|default({}) and csi_driver_smb.enabled|default(false) %#
+#% if addon_csi_driver_smb.enabled %#
 ---
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease

bootstrap/templates/kubernetes/apps/storage/csi-driver-smb/app/kustomization.yaml.j2

@@ -1,4 +1,4 @@
-#% if csi_driver_smb|default({}) and csi_driver_smb.enabled|default(false) %#
+#% if addon_csi_driver_smb.enabled %#
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization

bootstrap/templates/kubernetes/apps/storage/csi-driver-smb/app/secrets.sops.yaml.j2

@@ -1,5 +1,5 @@
-#% if csi_driver_smb|default({}) and csi_driver_smb.enabled|default(false) %#
-#% for item in csi_driver_smb.storage_class %#
+#% if addon_csi_driver_smb.enabled %#
+#% for item in addon_csi_driver_smb.storage_class %#
 #% if not item.existing_secret_name %#
 ---
 apiVersion: v1

bootstrap/templates/kubernetes/apps/storage/csi-driver-smb/app/storageclass.yaml.j2

@@ -1,5 +1,5 @@
-#% if csi_driver_smb|default({}) and csi_driver_smb.enabled|default(false) %#
-#% for item in csi_driver_smb.storage_class %#
+#% if addon_csi_driver_smb.enabled %#
+#% for item in addon_csi_driver_smb.storage_class %#
 ---
 apiVersion: storage.k8s.io/v1
 kind: StorageClass
@@ -25,6 +25,6 @@ mountOptions:
   - noperm
   - mfsymlinks
   - cache=strict
-  - noserverino  # required to prevent data corruption
+  - noserverino # required to prevent data corruption
 #% endfor %#
 #% endif %#

bootstrap/templates/kubernetes/apps/storage/csi-driver-smb/ks.yaml.j2

@@ -1,4 +1,4 @@
-#% if csi_driver_smb|default({}) and csi_driver_smb.enabled|default(false) %#
+#% if addon_csi_driver_smb.enabled %#
 ---
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization