From e2236a4663c18c0458ea0c4fad7ae0572c703b29 Mon Sep 17 00:00:00 2001
From: Jory Irving <46251616+LilDrunkenSmurf@users.noreply.github.com>
Date: Sat, 8 Jul 2023 17:43:43 -0600
Subject: [PATCH] feat(kubernetes-dashboard): Upgrade chart to 7.0.2 (#841)

* feat: upgrade chart

* fix: remove cert, due to using wildcart
---
 .../app/helmrelease.yaml.j2                   | 43 +++++++++++--------
 .../addons/kubernetes-dashboard/ks.yaml.j2    |  4 ++
 2 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/template/templates/addons/kubernetes-dashboard/app/helmrelease.yaml.j2 b/template/templates/addons/kubernetes-dashboard/app/helmrelease.yaml.j2
index 02303312..8421552e 100644
--- a/template/templates/addons/kubernetes-dashboard/app/helmrelease.yaml.j2
+++ b/template/templates/addons/kubernetes-dashboard/app/helmrelease.yaml.j2
@@ -9,7 +9,7 @@ spec:
   chart:
     spec:
       chart: kubernetes-dashboard
-      version: 6.0.8
+      version: 7.0.2
       sourceRef:
         kind: HelmRepository
         name: kubernetes-dashboard
@@ -31,24 +31,31 @@ spec:
   values:
     env:
       TZ: "${TIMEZONE}"
-    extraArgs:
-      - --enable-skip-login
-      - --disable-settings-authorizer
-      - --enable-insecure-login
-      - --token-ttl=43200
-    ingress:
-      enabled: true
-      className: nginx
-      annotations:
-        cert-manager.io/cluster-issuer: letsencrypt-staging
-        hajimari.io/icon: mdi:kubernetes
-      hosts:
-        - &host "kubernetes.${SECRET_DOMAIN}"
-      tls:
-        - hosts:
-            - *host
-          secretName: kubernetes-dashboard-tls
+    api:
+      containers:
+        args:
+          - --enable-insecure-login=true
+          - --enable-skip-login=true
+          - --disable-settings-authorizer=true
+    app:
+      ingress:
+        enabled: true
+        className: nginx
+        annotations:
+          hajimari.io/icon: mdi:kubernetes
+        hosts:
+          - &host "kubernetes.${SECRET_DOMAIN}"
+        tls:
+          - hosts:
+              - *host
+            secretName: kubernetes-dashboard-tls
     metricsScraper:
       enabled: true
     serviceMonitor:
       enabled: false
+    cert-manager:
+      enabled: false
+    nginx:
+      enabled: false
+    metrics-server:
+      enabled: false
diff --git a/template/templates/addons/kubernetes-dashboard/ks.yaml.j2 b/template/templates/addons/kubernetes-dashboard/ks.yaml.j2
index 284b0c2d..bd915215 100644
--- a/template/templates/addons/kubernetes-dashboard/ks.yaml.j2
+++ b/template/templates/addons/kubernetes-dashboard/ks.yaml.j2
@@ -5,6 +5,10 @@ metadata:
   name: cluster-apps-kubernetes-dashboard
   namespace: flux-system
 spec:
+  dependsOn:
+    - name: cluster-apps-cert-manager
+    - name: cluster-apps-ingress-nginx
+    - name: cluster-apps-metrics-server
   path: ./kubernetes/apps/monitoring/kubernetes-dashboard/app
   prune: true
   sourceRef: