From 27ca05b9d45eeaeb515d2d21d6198f22b975e943 Mon Sep 17 00:00:00 2001
From: Sebastian Florek <sebastian@plural.sh>
Date: Fri, 7 Feb 2025 14:01:51 +0100
Subject: [PATCH] update osbuilder chart to support console token secret ref

---
 charts/osbuilder/Chart.yaml                |  2 +-
 charts/osbuilder/templates/deployment.yaml | 20 +++++++++++++++++++-
 charts/osbuilder/values.yaml               |  8 ++++++--
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/charts/osbuilder/Chart.yaml b/charts/osbuilder/Chart.yaml
index 5c96a04..68559bf 100644
--- a/charts/osbuilder/Chart.yaml
+++ b/charts/osbuilder/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: osbuilder
 description: A Helm chart for osbuilder
 appVersion: 0.6.0
-version: 0.1.17
+version: 0.2.0
 dependencies:
   - name: cert-manager
     version: v1.16.3
diff --git a/charts/osbuilder/templates/deployment.yaml b/charts/osbuilder/templates/deployment.yaml
index 890f973..90f9708 100644
--- a/charts/osbuilder/templates/deployment.yaml
+++ b/charts/osbuilder/templates/deployment.yaml
@@ -1,3 +1,21 @@
+{{ $token := .Values.builder.consoleToken }}
+
+{{- if not $token }}
+
+  {{ $tokenSecret := lookup "v1" "Secret" .Release.Namespace .Values.builder.consoleTokenSecret.name }}
+
+  {{- if not $tokenSecret.data }}
+    {{- fail "Could not find secret provided via .Values.builder.consoleTokenSecret.name" }}
+  {{- end }}
+
+  {{ $token := index $tokenSecret.data .Values.builder.consoleTokenSecret.key | b64dec }}
+
+  {{- if not $token }}
+    {{- fail "Could not find token key value in the provided secret" }}
+  {{- end }}
+
+{{- end }}
+
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -29,7 +47,7 @@ spec:
           command: [ '/manager' ]
           args:
             - --console-url={{ .Values.builder.consoleUrl }}
-            - --console-token={{ .Values.builder.consoleToken }}
+            - --console-token={{ $token }}
             - --pvc-storage-size={{ .Values.builder.pvcStorageSize }}
             - --health-probe-bind-address=:8081
             - --metrics-bind-address=127.0.0.1:8080
diff --git a/charts/osbuilder/values.yaml b/charts/osbuilder/values.yaml
index 77bde81..f745d81 100644
--- a/charts/osbuilder/values.yaml
+++ b/charts/osbuilder/values.yaml
@@ -16,8 +16,12 @@ builder:
     tag: ~
 
   replicas: 1
-  consoleUrl: ""
-  consoleToken: ""
+
+  consoleUrl: ~
+  consoleToken: ~
+  consoleTokenSecret:
+    name: ~
+    key: token
 
 
   # The PVC storage size for the build process