fix logic

hasura · Oct 21, 2023 · e4a0bc7 · e4a0bc7
1 parent 3d61731
commit e4a0bc7
Showing 1 changed file with 7 additions and 12 deletions.
diff --git a/charts/graphql-engine/templates/deployment.yaml b/charts/graphql-engine/templates/deployment.yaml
@@ -289,22 +289,17 @@ spec:
       tolerations:
         {{- toYaml . | nindent 8 }}
     {{- end }}
-    {{- if (.Values.secretProviderClass).enabled }}
+    {{- if or .Values.extraVolumes (.Values.secretProviderClass).enabled }}
       volumes:
+      {{- if .Values.extraVolumes }}
+        {{- toYaml .Values.extraVolumes | nindent 8 }}
+      {{- end }}
+        {{- if (.Values.secretProviderClass).enabled }}
         - name: secrets-store-inline
           csi:
             driver: secrets-store.csi.k8s.io
             readOnly: true
             volumeAttributes:
               secretProviderClass: {{ coalesce .Values.secretProviderClass.name (printf "%s-secret-provider" $appName) }}
-        {{- if .Values.extraVolumes -}}
-      {{- with .extraVolumes }}
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-        {{- end -}}
-    {{- else if .Values.extraVolumes  -}}
-      volumes:
-      {{- with .extraVolumes }}
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-    {{- end }}
+        {{- end }}
+    {{- end }}