From 814d190331ee01d9c4aadd489ecde4c7ff45f3f8 Mon Sep 17 00:00:00 2001
From: Marc Portabella <marc.portabella-clotet@spendesk.com>
Date: Fri, 11 Oct 2024 03:03:04 +0200
Subject: [PATCH] chore: updates

---
 charts/netbird-dashboard/values.yaml           |  8 +++++++-
 charts/netbird/templates/relay-deployment.yaml | 11 ++++++++++-
 charts/netbird/values.yaml                     | 15 ++++++++++++---
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/charts/netbird-dashboard/values.yaml b/charts/netbird-dashboard/values.yaml
index 445f7b2..46ff223 100644
--- a/charts/netbird-dashboard/values.yaml
+++ b/charts/netbird-dashboard/values.yaml
@@ -181,7 +181,13 @@ env: {}
 
 ## @param management.envRaw
 ##
-envRaw: {}
+envRaw: []
+
+## @param management.envFromSecret
+##
+envFromSecret: []
+  #- name: CUSTOM_VAR_1
+  #  key: key1
 
 secretName: ""
 
diff --git a/charts/netbird/templates/relay-deployment.yaml b/charts/netbird/templates/relay-deployment.yaml
index 94fc529..91c461e 100644
--- a/charts/netbird/templates/relay-deployment.yaml
+++ b/charts/netbird/templates/relay-deployment.yaml
@@ -1,3 +1,5 @@
+{{- $secretName := printf "%s" (include "netbird.relay.secret" .) -}}
+
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -46,7 +48,7 @@ spec:
               port: {{ .Values.relay.service.name }}
           resources:
             {{- toYaml .Values.relay.resources | nindent 12 }}
-          {{- if or (.Values.relay.env) (.Values.relay.envRaw) }}
+          {{- if or (.Values.relay.env) (.Values.relay.envRaw) (.Values.relay.envFromSecret )}}
           env:
           {{- range $key, $val := .Values.relay.env }}
           - name: {{ $key }}
@@ -57,6 +59,13 @@ spec:
               {{- toYaml . | nindent 10 }}
             {{- end }}
           {{- end }}
+          {{- range $key, $val := .Values.relay.envFromSecret }}
+          - name: {{ .name }}
+            valueFrom:
+              secretKeyRef:
+                name: {{ $secretName }}
+                key: {{ .key }}
+          {{- end }}
           {{- end }}
       {{- with .Values.relay.nodeSelector }}
       nodeSelector:
diff --git a/charts/netbird/values.yaml b/charts/netbird/values.yaml
index 7773185..30cb8bb 100644
--- a/charts/netbird/values.yaml
+++ b/charts/netbird/values.yaml
@@ -41,14 +41,14 @@ management:
 
   ## @param management.envRaw
   ##
-  envRaw: {}
+  envRaw: []
     #- name: NETBIRD_STORE_ENGINE_POSTGRES_DSN
     #  valueFrom:
     #    secretKeyRef:
     #      name: netbird-management
     #      key: postgresDSN
 
-  envFromSecret: {}
+  envFromSecret: []
     #- name: CUSTOM_VAR_1
     #  key: key1
     #- name: CUSTOM_VAR_2
@@ -577,7 +577,9 @@ relay:
   ##
   affinity: {}
 
-  envRaw:
+  env: {}
+
+  envRaw: []
     #- name: NB_AUTH_SECRET
     #  valueFrom:
     #    secretKeyRef:
@@ -590,3 +592,10 @@ relay:
     #- name: NB_EXPOSED_ADDRESS
     #  value: rels://netbird.example.com:443/relay
 
+  envFromSecret: []
+    #- name: CUSTOM_VAR_1
+    #  key: key1
+    #- name: CUSTOM_VAR_2
+    #  key: key2
+    #- name: ANOTHER_VAR
+    #  key: key3