From ec6c812e19b8fcbea2c39989b06b7f979b27a396 Mon Sep 17 00:00:00 2001
From: Kjeld Schouten <info@kjeldschouten.nl>
Date: Thu, 27 Jun 2024 10:28:49 +0200
Subject: [PATCH] feat(kubernetes-dashboard): Allow kubernetes-dashboard
 without token login (#23841)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

**Description**
<!--
Please include a summary of the change and which issue is fixed. Please
also include relevant motivation and context. List any dependencies that
are required for this change.
-->
⚒️ Fixes  # <!--(issue)-->

**⚙️ Type of change**

- [ ] ⚙️ Feature/App addition
- [ ] 🪛 Bugfix
- [ ] ⚠️ Breaking change (fix or feature that would cause existing
functionality to not work as expected)
- [ ] 🔃 Refactor of current code

**🧪 How Has This Been Tested?**
<!--
Please describe the tests that you ran to verify your changes. Provide
instructions so we can reproduce. Please also list any relevant details
for your test configuration
-->

**📃 Notes:**
<!-- Please enter any other relevant information here -->

**✔️ Checklist:**

- [ ] ⚖️ My code follows the style guidelines of this project
- [ ] 👀 I have performed a self-review of my own code
- [ ] #️⃣ I have commented my code, particularly in hard-to-understand
areas
- [ ] 📄 I have made corresponding changes to the documentation
- [ ] ⚠️ My changes generate no new warnings
- [ ] 🧪 I have added tests to this description that prove my fix is
effective or that my feature works
- [ ] ⬆️ I increased versions for any altered app according to semantic
versioning
- [ ] I made sure the title starts with `feat(chart-name):`,
`fix(chart-name):` or `chore(chart-name):`

**➕ App addition**

If this PR is an app addition please make sure you have done the
following.

- [ ] 🖼️ I have added an icon in the Chart's root directory called
`icon.png`

---

_Please don't blindly check all the boxes. Read them and only check
those that apply.
Those checkboxes are there for the reviewer to see what is this all
about and
the status of this PR with a quick glance._
---
 .../premium/kubernetes-dashboard/Chart.yaml   |  2 +-
 .../premium/kubernetes-dashboard/values.yaml  | 50 +++++++++++++++++--
 2 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/charts/premium/kubernetes-dashboard/Chart.yaml b/charts/premium/kubernetes-dashboard/Chart.yaml
index 616f150c228..63ee9703e06 100644
--- a/charts/premium/kubernetes-dashboard/Chart.yaml
+++ b/charts/premium/kubernetes-dashboard/Chart.yaml
@@ -44,4 +44,4 @@ sources:
   - https://hub.docker.com/r/kubernetesui/dashboard-web
   - https://kubernetes-dashboard.universe.tf
 type: application
-version: 1.1.0
+version: 1.2.0
diff --git a/charts/premium/kubernetes-dashboard/values.yaml b/charts/premium/kubernetes-dashboard/values.yaml
index 15f7815c15a..00b01e3deea 100644
--- a/charts/premium/kubernetes-dashboard/values.yaml
+++ b/charts/premium/kubernetes-dashboard/values.yaml
@@ -1,4 +1,9 @@
 image:
+  pullPolicy: IfNotPresent
+  repository: tccr.io/tccr/kube-sa-proxy 
+  tag: latest
+
+webImage:
   repository: kubernetesui/dashboard-web
   pullPolicy: IfNotPresent
   tag: 1.4.0
@@ -19,14 +24,22 @@ scraperImage:
   tag: 1.1.1
 
 service:
-  # TODO: Point main to kong!
   main:
     enabled: true
     ports:
       main:
         enabled: true
         primary: true
-        port: 443
+        port: 80
+        targetPort: 3000
+        protocol: http
+  kubernetes-dashboard-forward:
+    expandObjectName: false
+    enabled: true
+    ports:
+      forward:
+        enabled: true
+        port: 8443
         targetPort: 8443
         protocol: https
     selectorLabels:
@@ -35,7 +48,7 @@ service:
   kubernetes-dashboard-web:
     expandObjectName: false
     enabled: true
-    targetSelector: main
+    targetSelector: web
     ports:
       web:
         enabled: true
@@ -76,10 +89,41 @@ service:
 workload:
   main:
     enabled: true
+    primary: true
+    type: Deployment
     podSpec:
       containers:
         main:
           enabled: true
+          primary: true
+          env:
+            PORT: 3000
+            API_FILE: /var/run/secrets/kubernetes.io/serviceaccount/token
+            PROXY_TARGET: https://kubernetes-dashboard-forward:8443
+            AUTH_TOKEN_HEADER: Authorization
+            AUTH_TOKEN_PREFIX: Bearer
+          probes:
+            liveness:
+              enabled: true
+              type: tcp
+              port: 3000
+            readiness:
+              enabled: true
+              type: tcp
+              port: 3000
+            startup:
+              enabled: true
+              type: tcp
+              port: 3000
+  web:
+    enabled: true
+    type: Deployment
+    podSpec:
+      containers:
+        web:
+          enabled: true
+          primary: true
+          imageSelector: webImage
           args:
             - --namespace={{ .Release.Namespace }}
             - --settings-config-map-name=kubernetes-dashboard-settings