feat: added volume and volume mounts

Unleash · Oct 22, 2024 · 30d129a · 30d129a
1 parent 00dd51b
commit 30d129a
Show file tree

Hide file tree

Showing 8 changed files with 56 additions and 10 deletions.
diff --git a/charts/unleash-proxy/Chart.yaml b/charts/unleash-proxy/Chart.yaml
@@ -16,7 +16,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.8.9
+version: 0.8.10
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/unleash-proxy/examples/addingExistingSecrets.yaml b/charts/unleash-proxy/examples/addingExistingSecrets.yaml
@@ -1,5 +1,5 @@
 # Adds environment variables
-env: 
+env:
   - name: LOG_LEVEL
     value: info
 
@@ -21,3 +21,11 @@ proxy:
     enabled: true
     name: unleash-proxy-secret
     key: clientKeys
+
+volumes:
+  - name: secrets-store-inline
+    mountPath: "/mnt/secrets-store"
+volumeMounts:
+  - name: secrets-store-inline
+    mountPath: "/mnt/secrets-store"
+    readOnly: true
diff --git a/charts/unleash-proxy/templates/deployment.yaml b/charts/unleash-proxy/templates/deployment.yaml
@@ -118,7 +118,15 @@ spec:
           - mountPath: /mnt/secrets
             name: mount-secrets
             readOnly: true
+           {{ if .Values.volumeMounts }}
+            {{- toYaml .Values.volumeMounts | nindent 12 }}
            {{- end }}
+          {{- else }}
+          {{ if .Values.volumeMounts }}
+          volumeMounts:
+              {{- toYaml .Values.volumeMounts | nindent 12 }}
+            {{- end }}
+          {{- end }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
         {{- if .Values.edge.enable }}
@@ -161,7 +169,7 @@ spec:
             - mountPath: "/data/config"
               name: edge-features
         {{- end }}
-      {{- if or .Values.edge.enable .Values.mountSecretName }}
+      {{- if or .Values.edge.enable .Values.mountSecretName .Values.volumes }}
       volumes:
         {{- if .Values.mountSecretName }}
         - name: mount-secrets
@@ -173,6 +181,9 @@ spec:
           configMap:
             name: edge-features
         {{- end }}
+        {{- if .Values.volumes }}
+        {{- toYaml .Values.volumes | nindent 8 }}
+        {{- end }}
       {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:

diff --git a/charts/unleash-proxy/values.yaml b/charts/unleash-proxy/values.yaml
@@ -160,3 +160,7 @@ podDisruptionBudget:
   enabled: false
   minAvailable:
   maxUnavailable: 1
+
+# Add additional volumes and mounts, for example to read other secrets.
+volumes: []
+volumeMounts: []
diff --git a/charts/unleash/Chart.yaml b/charts/unleash/Chart.yaml
@@ -5,7 +5,7 @@ icon: https://docs.getunleash.io/img/logo.svg
 
 type: application
 
-version: 5.3.1
+version: 5.3.2
 
 appVersion: "6.3.0"
 

diff --git a/charts/unleash/examples/existingSecrets.yaml b/charts/unleash/examples/existingSecrets.yaml
@@ -3,4 +3,16 @@ existingSecrets:
     valueFrom:
       secretKeyRef:
         name: secretname
-        key: secretkey
+        key: secretkey
+
+volumeMounts:
+  - name: secrets-store-inline
+    mountPath: "/mnt/secrets-store"
+    readOnly: true
+
+volumes:
+  - name: secrets-store-inline
+    mountPath: "/mnt/secrets-store"
+
+postgres:
+  enabled: false
diff --git a/charts/unleash/templates/deployment.yaml b/charts/unleash/templates/deployment.yaml
@@ -131,13 +131,16 @@ spec:
           {{- end }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
-          {{- if .Values.configMaps }}
+          {{- if or .Values.configMaps .Values.volumeMounts }}
           volumeMounts:
             {{-  range $key, $value := .Values.configMaps }}
             - name: config-dir
               mountPath: {{ .mountPath }}
               subPath: {{ $key }}
             {{- end }}
+            {{- if .Values.volumeMounts }}
+            {{- toYaml .Values.volumeMounts | nindent 12 }}
+            {{- end }}
           {{- end }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
@@ -162,11 +165,14 @@ spec:
       initContainers:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- if .Values.configMaps }}
+      {{- if or .Values.configMaps .Values.volumes }}
       volumes:
         - name: config-dir
           configMap:
             name: {{ include "unleash.fullname" . }}
+        {{- if .Values.volumes }}
+        {{- toYaml .Values.volumes | nindent 8 }}
+        {{- end }}
       {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
@@ -175,13 +181,13 @@ spec:
       {{- with .Values.affinity }}
       affinity:
         {{ toYaml . | nindent 8 }}
-      {{- end }}        
+      {{- end }}
       {{- with .Values.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       {{- with .Values.topologySpreadConstraints }}
-      topologySpreadConstraints: 
+      topologySpreadConstraints:
       {{- range . }}
       - {{ toYaml . | nindent 8 | trim }}
         labelSelector:

diff --git a/charts/unleash/values.yaml b/charts/unleash/values.yaml
@@ -246,7 +246,12 @@ podDisruptionBudget:
   minAvailable:
   maxUnavailable: 1
 
-topologySpreadConstraints: {}
+topologySpreadConstraints:
+  {}
   # - maxSkew: 1
   #   topologyKey: topology.kubernetes.io/zone
   #   whenUnsatisfiable: DoNotSchedule
+
+# Add additional volumes and mounts, for example to read other secrets.
+volumes: []
+volumeMounts: []