From 5405e917fd29e2929eb2a609b0dddd0e28d94b55 Mon Sep 17 00:00:00 2001
From: Mac Browning <mac@vantage.sh>
Date: Wed, 1 Nov 2023 13:56:12 -0700
Subject: [PATCH] Allow users to provide a Secret name and key.

---
 charts/vantage-kubernetes-agent/Chart.yaml                 | 2 +-
 charts/vantage-kubernetes-agent/templates/secret.yaml      | 2 ++
 charts/vantage-kubernetes-agent/templates/statefulset.yaml | 7 ++++++-
 charts/vantage-kubernetes-agent/values.yaml                | 4 ++++
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/charts/vantage-kubernetes-agent/Chart.yaml b/charts/vantage-kubernetes-agent/Chart.yaml
index 6bb0f97..35d24e9 100644
--- a/charts/vantage-kubernetes-agent/Chart.yaml
+++ b/charts/vantage-kubernetes-agent/Chart.yaml
@@ -2,6 +2,6 @@ apiVersion: v2
 name: vantage-kubernetes-agent
 description: Provisions the Vantage Kubernetes agent.
 type: application
-version: 1.0.10
+version: 1.0.11
 appVersion: "1.0.8"
 icon: "https://www.vantage.sh/nav-logo.svg"
diff --git a/charts/vantage-kubernetes-agent/templates/secret.yaml b/charts/vantage-kubernetes-agent/templates/secret.yaml
index e82c82a..9a5309e 100644
--- a/charts/vantage-kubernetes-agent/templates/secret.yaml
+++ b/charts/vantage-kubernetes-agent/templates/secret.yaml
@@ -1,3 +1,4 @@
+{{- if not .Values.agent.secret.name }}
 {{- $token := .Values.agent.token | required ".Values.agent.token is required."}}
 apiVersion: v1
 kind: Secret
@@ -8,3 +9,4 @@ metadata:
 type: Opaque
 data:
   token: {{ $token | b64enc | quote }}
+{{- end }}
diff --git a/charts/vantage-kubernetes-agent/templates/statefulset.yaml b/charts/vantage-kubernetes-agent/templates/statefulset.yaml
index 22a7a26..73a5aa1 100644
--- a/charts/vantage-kubernetes-agent/templates/statefulset.yaml
+++ b/charts/vantage-kubernetes-agent/templates/statefulset.yaml
@@ -1,4 +1,4 @@
-{{- $clusterID := .Values.agent.clusterID | required ".Values.clusterID.token is required."}}
+{{- $clusterID := .Values.agent.clusterID | required ".Values.agent.clusterID is required."}}
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
@@ -41,8 +41,13 @@ spec:
             - name: VANTAGE_API_TOKEN
               valueFrom:
                 secretKeyRef:
+                  {{- if .Values.agent.secret.name }}
+                  name: {{ .Values.agent.secret.name }}
+                  key: {{ .Values.agent.secret.key }}
+                  {{- else }}
                   name: {{ include "vantage-kubernetes-agent.fullname" . }}
                   key: token
+                  {{- end }}
             {{- with .Values.agent.apiHost }}
             - name: VANTAGE_API_HOST
               value: "{{ . }}"
diff --git a/charts/vantage-kubernetes-agent/values.yaml b/charts/vantage-kubernetes-agent/values.yaml
index 6695740..d1c0171 100644
--- a/charts/vantage-kubernetes-agent/values.yaml
+++ b/charts/vantage-kubernetes-agent/values.yaml
@@ -18,6 +18,10 @@ agent:
   clusterID: ""
   # Vantage API Token
   token: ""
+  # If the Secret is pre-provisioned, can override the secret name and key as needed below. If name is not set a Secret using `token` is provisioned.
+  secret:
+    name: ""
+    key: "token"
 
 persist:
   mountPath: "/var/lib/vantage-agent"