Test

sanbotto · Aug 15, 2023 · 19061e8 · 19061e8
1 parent fc4341a
commit 19061e8
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/charts/common/Chart.yaml b/charts/common/Chart.yaml
@@ -15,11 +15,11 @@ 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.0.15-beta8
+version: 0.0.15-beta9
 
 # 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
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.0.15-beta8"
+appVersion: "0.0.15-beta9"
 icon: https://cncf-branding.netlify.app/img/projects/helm/horizontal/color/helm-horizontal-color.png
diff --git a/charts/common/templates/configMap.yaml b/charts/common/templates/configMap.yaml
@@ -1,9 +1,8 @@
 {{- if .Values.configMap }}
-{{- $fullName := include "common.fullname" . -}}
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ $fullName }}-{{ .Values.configMap.name }}-volume
+  name: {{ .Values.configMap.name }}
   labels:
     {{- include "common.labels" . | nindent 4 }}
     {{- with .Values.labels }}

diff --git a/charts/common/templates/deployment.yaml b/charts/common/templates/deployment.yaml
@@ -43,14 +43,16 @@ spec:
       {{- if .Values.deployment.volumes }}
       volumes:
         {{- range $volume := .Values.deployment.volumes }}
-        - name: {{ $fullName }}-{{ $volume.name }}-volume
         {{- if $volume.configMap }}
+        - name: {{ $volume.configMap.name }}
           configMap:
           {{- toYaml $volume.configMap | nindent 10 }}
         {{- else if $volume.secret }}
+        - name: {{ $volume.secret.name }}
           secret:
           {{- toYaml $volume.secret | nindent 10 }}
         {{- else }}
+        - name: {{ $fullName }}-{{ $volume.name }}-volume
           persistentVolumeClaim:
             claimName: {{ $fullName }}-{{ $volume.name }}-pvc
         {{- end }}
@@ -64,11 +66,14 @@ spec:
           {{- if .Values.deployment.volumes }}
           volumeMounts:
             {{- range $volume := .Values.deployment.volumes }}
-            - name: {{ $fullName }}-{{ $volume.name }}-volume
+            {{- if or $volume.configMap $volume.secret }}
+            - name: {{ coalesce $volume.configMap.name $volume.secret.name }}
               mountPath: {{ $volume.mountPath }}
-              {{- if or $volume.configMap $volume.secret }}
               readOnly: true
-              {{- end }}
+            {{- else }}
+            - name: {{ $fullName }}-{{ $volume.name }}-volume
+              mountPath: {{ $volume.mountPath }}
+            {{- end }}
             {{- end }}
           {{- end }}
           {{- if .Values.command }}