From 49ad1962b71b5c4565edd182429f91fc7398bb8a Mon Sep 17 00:00:00 2001
From: Edward Cheng <edward@cheng.sydney>
Date: Wed, 24 Jul 2024 07:58:54 +1000
Subject: [PATCH] fix namespace issue

---
 apps/kubernetes-dashboard/base/kustomization.yaml        | 3 ++-
 apps/kubernetes-dashboard/base/values.yaml               | 8 ++++++++
 apps/kubernetes-dashboard/env/k3s-cluster/config.json    | 4 ++--
 .../env/k3s-cluster/kustomization.yaml                   | 4 +---
 resources/namespaces/base/kubernetes-dashboard.yaml      | 9 ---------
 resources/namespaces/base/kustomization.yaml             | 1 -
 6 files changed, 13 insertions(+), 16 deletions(-)
 create mode 100644 apps/kubernetes-dashboard/base/values.yaml
 delete mode 100644 resources/namespaces/base/kubernetes-dashboard.yaml

diff --git a/apps/kubernetes-dashboard/base/kustomization.yaml b/apps/kubernetes-dashboard/base/kustomization.yaml
index dfef520..e539a2c 100644
--- a/apps/kubernetes-dashboard/base/kustomization.yaml
+++ b/apps/kubernetes-dashboard/base/kustomization.yaml
@@ -4,4 +4,5 @@ helmCharts:
   - name: kubernetes-dashboard
     repo: https://kubernetes.github.io/dashboard/
     version: 7.5.0
-    releaseName: kubernetes-dashboard
\ No newline at end of file
+    releaseName: kubernetes-dashboard
+    valuesFile: values.yaml
\ No newline at end of file
diff --git a/apps/kubernetes-dashboard/base/values.yaml b/apps/kubernetes-dashboard/base/values.yaml
new file mode 100644
index 0000000..007cea9
--- /dev/null
+++ b/apps/kubernetes-dashboard/base/values.yaml
@@ -0,0 +1,8 @@
+app:
+  ingress:
+    enabled: true
+    hosts:
+      - k3s-dashboard.cluster.edward.sydney
+    ingressClassName: nginx
+    tls:
+      enabled: false
\ No newline at end of file
diff --git a/apps/kubernetes-dashboard/env/k3s-cluster/config.json b/apps/kubernetes-dashboard/env/k3s-cluster/config.json
index 135ed6a..2d65284 100644
--- a/apps/kubernetes-dashboard/env/k3s-cluster/config.json
+++ b/apps/kubernetes-dashboard/env/k3s-cluster/config.json
@@ -1,8 +1,8 @@
 {
   "appName": "kubernetes-dashboard",
   "userGivenName": "kubernetes-dashboard",
-  "namespace": "kubernetes-dashboard",
-  "destNamespace": "kubernetes-dashboard",
+  "namespace": "argocd",
+  "destNamespace": "argocd",
   "destServer": "https://kubernetes.default.svc",
   "srcPath": "apps/kubernetes-dashboard/env/k3s-cluster",
   "srcRepoURL": "https://github.com/3dwardch3ng/home-cluster-ops.git",
diff --git a/apps/kubernetes-dashboard/env/k3s-cluster/kustomization.yaml b/apps/kubernetes-dashboard/env/k3s-cluster/kustomization.yaml
index 68fc6ec..a227ac4 100644
--- a/apps/kubernetes-dashboard/env/k3s-cluster/kustomization.yaml
+++ b/apps/kubernetes-dashboard/env/k3s-cluster/kustomization.yaml
@@ -1,6 +1,4 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - ./configmap.yaml
-  - ../../base
-  - ./ingress.yaml
\ No newline at end of file
+  - ../../base
\ No newline at end of file
diff --git a/resources/namespaces/base/kubernetes-dashboard.yaml b/resources/namespaces/base/kubernetes-dashboard.yaml
deleted file mode 100644
index 7310d7a..0000000
--- a/resources/namespaces/base/kubernetes-dashboard.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  annotations:
-    argocd.argoproj.io/sync-options: Prune=false
-  creationTimestamp: null
-  name: kubernetes-dashboard
-spec: {}
-status: {}
diff --git a/resources/namespaces/base/kustomization.yaml b/resources/namespaces/base/kustomization.yaml
index a02b932..f33cb14 100644
--- a/resources/namespaces/base/kustomization.yaml
+++ b/resources/namespaces/base/kustomization.yaml
@@ -16,7 +16,6 @@ resources:
   - ./ingress-nginx.yaml
   - ./jellyfin.yaml
   - ./kavita.yaml
-  - ./kubernetes-dashboard.yaml
   - ./local-path-storage.yaml
   - ./logstash.yaml
   - ./minio.yaml