feat: rename addon vars to addon_ prefix and simplify logic in jinja templates (#1216)

Signed-off-by: Devin Buhl <devin@buhl.casa>
2024-01-21 09:05:23 -05:00
1 parent b89b7b3ed9
commit db21ea82fa
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,4 +1,4 @@
-#% if homepage|default({}) and homepage.enabled|default(false) %#
+#% if addon_homepage.enabled %#
 ---
 apiVersion: v1
 kind: ConfigMap
@@ -1,4 +1,4 @@
-#% if homepage|default({}) and homepage.enabled|default(false) %#
+#% if addon_homepage.enabled %#
 ---
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
@@ -1,4 +1,4 @@
-#% if homepage|default({}) and homepage.enabled|default(false) %#
+#% if addon_homepage.enabled %#
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
@@ -1,4 +1,4 @@
-#% if homepage|default({}) and homepage.enabled|default(false) %#
+#% if addon_homepage.enabled %#
 ---
 apiVersion: v1
 kind: Secret
@@ -1,4 +1,4 @@
-#% if homepage|default({}) and homepage.enabled|default(false) %#
+#% if addon_homepage.enabled %#
 ---
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
@@ -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 %#
@@ -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 %#
@@ -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
@@ -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
@@ -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 %#
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,4 +1,4 @@
-#% if grafana|default({}) and grafana.enabled|default(false) %#
+#% if addon_grafana.enabled %#
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
@@ -1,4 +1,4 @@
-#% if grafana|default({}) and grafana.enabled|default(false) %#
+#% if addon_grafana.enabled %#
 ---
 apiVersion: v1
 kind: Secret
@@ -1,4 +1,4 @@
-#% if grafana|default({}) and grafana.enabled|default(false) %#
+#% if addon_grafana.enabled %#
 ---
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
 ---
@@ -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
@@ -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 %#
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 %#
@@ -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
@@ -3,14 +3,14 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
  - ./namespace.yaml
-  #% if csi_driver_nfs|default({}) and csi_driver_nfs.enabled|default(false) %#
+  #% if addon_csi_driver_nfs.enabled %#
  - ./csi-driver-nfs/ks.yaml
  #% endif %#
-  #% if csi_driver_smb|default({}) and csi_driver_smb.enabled|default(false) %#
+  #% if addon_csi_driver_smb.enabled %#
  - ./csi-driver-smb/ks.yaml
  #% endif %#
  - ./openebs/ks.yaml
-  #% if volsync|default({}) and volsync.enabled|default(false) %#
+  #% if addon_volsync.enabled %#
  - ./volsync/ks.yaml
  #% endif %#

@@ -1,4 +1,4 @@
-#% if volsync|default({}) and volsync.enabled|default(false) %#
+#% if addon_volsync.enabled %#
 ---
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
@@ -1,4 +1,4 @@
-#% if volsync|default({}) and volsync.enabled|default(false) %#
+#% if addon_volsync.enabled %#
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
@@ -1,4 +1,4 @@
-#% if volsync|default({}) and volsync.enabled|default(false) %#
+#% if addon_volsync.enabled %#
 ---
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
@@ -1,4 +1,4 @@
-#% if volsync|default({}) and volsync.enabled|default(false) %#
+#% if addon_volsync.enabled %#
 ---
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
@@ -10,7 +10,7 @@ spec:
  commonMetadata:
    labels:
      app.kubernetes.io/name: *app
-  #% if longhorn|default({}) and longhorn.enabled|default(false) %#
+  #% if addon_longhorn.enabled %#
  dependsOn:
    - name: longhorn
  #% endif %#
@@ -1,4 +1,4 @@
-#% if volsync|default({}) and volsync.enabled|default(false) %#
+#% if addon_volsync.enabled %#
 ---
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
@@ -27,7 +27,7 @@ spec:
    keepHistory: false
  values:
    controller:
-      #% if bootstrap_distribution in ['k0s', 'k3s'] and longhorn|default({}) and longhorn.enabled|default(false) %#
+      #% if bootstrap_distribution in ['k0s', 'k3s'] and addon_longhorn.enabled %#
      volumeSnapshotClasses:
        - name: longhorn-snapclass
          annotations:
@@ -1,4 +1,4 @@
-#% if volsync|default({}) and volsync.enabled|default(false) %#
+#% if addon_volsync.enabled %#
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
@@ -5,6 +5,6 @@ resources:
  - ./namespace.yaml
  - ./descheduler/ks.yaml
  - ./reloader/ks.yaml
-  #% if bootstrap_distribution == "k3s" and system_upgrade_controller|default({}) and system_upgrade_controller.enabled|default(false) %#
+  #% if bootstrap_distribution == "k3s" and addon_system_upgrade_controller.enabled %#
  - ./system-upgrade-controller/ks.yaml
  #% endif %#
@@ -1,4 +1,4 @@
-#% if bootstrap_distribution == "k3s" and system_upgrade_controller|default({}) and system_upgrade_controller.enabled|default(false) %#
+#% if bootstrap_distribution == "k3s" and addon_system_upgrade_controller.enabled %#
 ---
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
@@ -1,4 +1,4 @@
-#% if bootstrap_distribution == "k3s" and system_upgrade_controller|default({}) and system_upgrade_controller.enabled|default(false) %#
+#% if bootstrap_distribution == "k3s" and addon_system_upgrade_controller.enabled %#
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
@@ -1,4 +1,4 @@
-#% if bootstrap_distribution == "k3s" and system_upgrade_controller|default({}) and system_upgrade_controller.enabled|default(false) %#
+#% if bootstrap_distribution == "k3s" and addon_system_upgrade_controller.enabled %#
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
@@ -1,4 +1,4 @@
-#% if bootstrap_distribution == "k3s" and system_upgrade_controller|default({}) and system_upgrade_controller.enabled|default(false) %#
+#% if bootstrap_distribution == "k3s" and addon_system_upgrade_controller.enabled %#
 ---
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
@@ -1,4 +1,4 @@
-#% if bootstrap_distribution == "k3s" and system_upgrade_controller|default({}) and system_upgrade_controller.enabled|default(false) %#
+#% if bootstrap_distribution == "k3s" and addon_system_upgrade_controller.enabled %#
 ---
 apiVersion: upgrade.cattle.io/v1
 kind: Plan
@@ -1,4 +1,4 @@
-#% if bootstrap_distribution == "k3s" and system_upgrade_controller|default({}) and system_upgrade_controller.enabled|default(false) %#
+#% if bootstrap_distribution == "k3s" and addon_system_upgrade_controller.enabled %#
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
@@ -1,4 +1,4 @@
-#% if bootstrap_distribution == "k3s" and system_upgrade_controller|default({}) and system_upgrade_controller.enabled|default(false) %#
+#% if bootstrap_distribution == "k3s" and addon_system_upgrade_controller.enabled %#
 ---
 apiVersion: upgrade.cattle.io/v1
 kind: Plan
@@ -37,7 +37,7 @@ spec:
          before:
            - sudo bash /home/#{ item.username }#/k0s/hooks/apply-system.sh
            - sudo mv /home/#{ item.username }#/k0s/containerd/unprivileged-ports.toml /etc/k0s/containerd.d/unprivileged-ports.toml
-            #% if spegel.enabled %#
+            #% if addon_spegel.enabled %#
            - sudo mv /home/#{ item.username }#/k0s/containerd/spegel.toml /etc/k0s/containerd.d/spegel.toml
            #% endif %#
        reset:
@@ -77,7 +77,7 @@ controlPlane:
              [plugins."io.containerd.grpc.v1.cri"]
                enable_unprivileged_ports = true
                enable_unprivileged_icmp = true
-              #% if spegel.enabled %#
+              #% if addon_spegel.enabled %#
              [plugins."io.containerd.grpc.v1.cri".containerd]
                discard_unpacked_layers = false
              [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
@@ -44,7 +44,7 @@ hubble:
    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: Network