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 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 %#