use env from kube secret instead of vault

InseeFrLab · Jan 13, 2022 · 4f9953a · 4f9953a
1 parent fbb1a66
commit 4f9953a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 16 deletions.
diff --git a/charts/shiny/Chart.yaml b/charts/shiny/Chart.yaml
@@ -15,7 +15,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.2.0
+version: 0.3.0
 
 # 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/shiny/templates/configmap-vault.yaml b/charts/shiny/templates/configmap-vault.yaml
diff --git a/charts/shiny/templates/deployment.yaml b/charts/shiny/templates/deployment.yaml
@@ -37,10 +37,8 @@ spec:
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           envFrom:
-            {{- if .Values.vault.enabled }}
-            - configMapRef:
-                name: {{ include "library-chart.configMapNameVault" . }}
-            {{- end }}
+          - secretRef:
+              name: {{ .Values.externalPostgreSQL.credentialsSecretName }}
           ports:
             - name: http
               containerPort: 3838

diff --git a/charts/shiny/values.yaml b/charts/shiny/values.yaml
@@ -74,14 +74,6 @@ tolerations: []
 
 affinity: {}
 
-vault:
-  # Specifies whether a config map should be created
+externalPostgreSQL:
   enabled: false
-  # The name of the configmap to use.
-  # If not set and create is true, a name is generated using the fullname template
-  configMapName: ""
-  token: ""
-  url: ""
-  mount: ""
-  secret: ""
-  directory: ""
+  credentialsSecretName: ""