Merge pull request #242 from akash4sh/main

Add secret reference for NATS token
intelops · Sep 19, 2023 · d347ca3 · d347ca3
2 parents 61e2e19 + 432e901
commit d347ca3
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 11 deletions.
diff --git a/charts/nats/Chart.yaml b/charts/nats/Chart.yaml
@@ -19,4 +19,4 @@ maintainers:
   name: Jaime Piña
   url: https://github.com/variadico
 name: nats
-version: 0.13.4
+version: 0.13.5
diff --git a/charts/nats/templates/configmap.yaml b/charts/nats/templates/configmap.yaml
@@ -482,11 +482,13 @@ data:
     system_account: {{ . }}
     {{- end }}
 
-    {{- with .Values.auth.token }}
     authorization {
-      token: "{{ . }}"
-
-
+      {{- if .Values.auth.token }}
+      token: "{{ .Values.auth.token }}"
+      {{- else if .Values.auth.secret }}
+      token: $AUTH_TOKEN
+      {{- end }}
+           
       {{- if $.Values.auth.timeout }}
       timeout: {{ $.Values.auth.timeout }}
       {{- end }}
@@ -539,6 +541,4 @@ data:
     accounts: {{- toRawJson . }}
     {{- end }}
 
-    {{- end }}
-
-    {{- end }}
+    {{- end }}
diff --git a/charts/nats/templates/statefulset.yaml b/charts/nats/templates/statefulset.yaml
@@ -318,7 +318,6 @@ spec:
               fieldPath: metadata.namespace
         - name: CLUSTER_ADVERTISE
           value: {{ include "nats.clusterAdvertise" . }}
-
         {{- if .Values.nats.jetstream.enabled }}
         {{- with .Values.nats.jetstream.encryption }}
         {{- with .secret }}
@@ -330,6 +329,13 @@ spec:
         {{- end }}
         {{- end }}
         {{- end }}
+        {{- if and .Values.auth.enabled .Values.auth.secret }}
+        - name: AUTH_TOKEN
+          valueFrom:
+            secretKeyRef:
+              name: {{ .Values.auth.secret.name }}
+              key: {{ .Values.auth.secret.key }}
+        {{- end }}
         volumeMounts:
           - name: config-volume
             mountPath: /etc/nats-config

diff --git a/charts/nats/values.yaml b/charts/nats/values.yaml
@@ -531,8 +531,13 @@ auth:
   #     name: operator-jwt
   #     key: KO.jwt
 
-  # Token authentication
-  # token:
+  # Use key if you want to provide the token via Helm Values
+  # token: 
+
+  # Use a secret reference if you want to get a token from a secret
+  # secret:
+  #   name: "nats-token"
+  #   key: "key"
 
   # NKey authentication
   # nkeys: