diff --git a/charts/common/Chart.yaml b/charts/common/Chart.yaml index bdca16f..4caff9f 100644 --- 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-beta13 +version: 0.0.15-beta14 # 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-beta13" +appVersion: "0.0.15-beta14" icon: https://cncf-branding.netlify.app/img/projects/helm/horizontal/color/helm-horizontal-color.png diff --git a/charts/common/templates/deployment.yaml b/charts/common/templates/deployment.yaml index acf6b9c..c962189 100644 --- a/charts/common/templates/deployment.yaml +++ b/charts/common/templates/deployment.yaml @@ -43,23 +43,14 @@ spec: {{- if .Values.deployment.volumes }} volumes: {{- range $volume := .Values.deployment.volumes }} - #{{- if $volume.configMap }} - name: {{ $volume.name }} configMap: - #{{- toYaml $volume.configMap | nindent 12 }} name: {{ $volume.configMap.name }} items: - - key: {{ $volume.configMap.items.key }} - path: {{ $volume.configMap.items.path }} - #{{- else if $volume.secret }} - #- name: {{ $volume.name }} - # secret: - # {{- toYaml $volume.secret | nindent 12 }} - #{{- else }} - #- name: {{ $fullName }}-{{ $volume.name }}-volume - # persistentVolumeClaim: - # claimName: {{ $fullName }}-{{ $volume.name }}-pvc - #{{- end }} + {{- range $item := $volume.configMap.items }} + - key: {{ $item.key }} + path: {{ $item.path }} + {{- end }} {{- end }} {{- end }} containers: @@ -70,15 +61,8 @@ spec: {{- if .Values.deployment.volumes }} volumeMounts: {{- range $volume := .Values.deployment.volumes }} - #{{- if $volume.configMap }} - name: {{ $volume.name }} readOnly: true - #{{- else if $volume.secret }} - #- name: {{ $volume.secret.name }} - # readOnly: true - #{{- else }} - #- name: {{ $fullName }}-{{ $volume.name }}-volume - #{{- end}} mountPath: {{ $volume.mountPath }} {{- end }} {{- end }}