volumes

throwoutofcoffeeexception · Jan 27, 2022 · 4389cc9 · 4389cc9
1 parent 7700450
commit 4389cc9
Show file tree

Hide file tree

Showing 9 changed files with 65 additions and 58 deletions.
diff --git a/README.md b/README.md
@@ -1 +1,18 @@
 # Nixys common Helm chart
+
+## Volumes
+
+### .volumes
+
+На уровне workload
+
+```yaml
+  volumes:
+  - name: secret-file
+    type: secret
+  - name: app-config
+    type: configMap
+  - name: app-pvc
+    type: pvc
+    nameOverride: some-name-of-the-resource
+```
diff --git a/templates/cronjob.yml b/templates/cronjob.yml
@@ -285,21 +285,14 @@ spec:
             {{- end }}
           {{- end }}
           volumes:
-          {{- if .templatedVolumes }}
-          {{- include "helpers.volumes.templated" ( dict "volumes" .templatedVolumes "context" $) | indent 10}}
-          {{- end }}
-          {{- range $.Values.pvcs }}
-          {{- $claimName := "" -}}
-          {{- if .nameOverride -}}{{- $claimName = .nameOverride -}}{{- else -}}{{- $claimName = include "helpers.app.fullname" (dict "name" .name "context" $) -}}{{- end }}
-          - name: {{ $claimName }}
-            persistentVolumeClaim:
-              claimName: {{ $claimName }}
+          {{- if .volumes }}
+          {{- include "helpers.volumes.templated" ( dict "volumes" .volumes "context" $) | indent 10}}
           {{- end }}
           {{- if .extraVolumes }}
           {{- include "helpers.tplvalues.render" ( dict "value" .extraVolumes "context" $) | nindent 10 }}
-          {{- else if $general.extraVolumes }}
+          {{- end }}{{- if $general.extraVolumes }}
           {{- include "helpers.tplvalues.render" ( dict "value" $general.extraVolumes "context" $) | nindent 10 }}
-          {{- else if $.Values.generic.extraVolumes }}
+          {{- end }}{{- if $.Values.generic.extraVolumes }}
           {{- include "helpers.tplvalues.render" ( dict "value" $.Values.generic.extraVolumes "context" $) | nindent 10 }}
           {{- end }}
           restartPolicy: {{ .restartPolicy | default "Never" }}

diff --git a/templates/deployment.yml b/templates/deployment.yml
@@ -236,19 +236,12 @@ spec:
         {{- end }}
       {{- end }}
       volumes:
-      {{- if .templatedVolumes }}
-      {{- include "helpers.volumes.templated" ( dict "volumes" .templatedVolumes "context" $) | indent 6}}
-      {{- end }}
-      {{- range $.Values.pvcs }}
-      {{- $claimName := "" -}}
-      {{- if .nameOverride -}}{{- $claimName = .nameOverride -}}{{- else -}}{{- $claimName = include "helpers.app.fullname" (dict "name" .name "context" $) -}}{{- end }}
-      - name: {{ $claimName }}
-        persistentVolumeClaim:
-          claimName: {{ $claimName }}
+      {{- if .volumes }}
+      {{- include "helpers.volumes.templated" ( dict "volumes" .volumes "context" $) | indent 6}}
       {{- end }}
       {{- if .extraVolumes }}
       {{- include "helpers.tplvalues.render" ( dict "value" .extraVolumes "context" $) | nindent 6 }}
-      {{- else if $.Values.generic.extraVolumes }}
+      {{- end }}{{- if $.Values.generic.extraVolumes }}
       {{- include "helpers.tplvalues.render" ( dict "value" $.Values.generic.extraVolumes "context" $) | nindent 6 }}
       {{- end }}
 {{- end }}

diff --git a/templates/helm-hooks.yml b/templates/helm-hooks.yml
@@ -249,8 +249,8 @@ spec:
       {{- end }}
       {{- end }}
       volumes:
-      {{- if .templatedVolumes }}
-      {{- include "helpers.volumes.templated" ( dict "volumes" .templatedVolumes "context" $) | indent 6}}
+      {{- if .volumes }}
+      {{- include "helpers.volumes.templated" ( dict "volumes" .volumes "context" $) | indent 6}}
       {{- end }}
       {{- if .extraVolumes }}
       {{- include "helpers.tplvalues.render" ( dict "value" .extraVolumes "context" $) | nindent 6 }}
@@ -474,14 +474,14 @@ spec:
       {{- end }}
       {{- end }}
       volumes:
-      {{- if .templatedVolumes }}
-      {{- include "helpers.volumes.templated" ( dict "volumes" .templatedVolumes "context" $) | indent 6}}
+      {{- if .volumes }}
+      {{- include "helpers.volumes.templated" ( dict "volumes" .volumes "context" $) | indent 6}}
       {{- end }}
       {{- if .extraVolumes }}
       {{- include "helpers.tplvalues.render" ( dict "value" .extraVolumes "context" $) | nindent 6 }}
-      {{- else if $general.extraVolumes }}
+      {{- end }}{{- if $general.extraVolumes }}
       {{- include "helpers.tplvalues.render" ( dict "value" $general.extraVolumes "context" $) | nindent 6 }}
-      {{- else if $.Values.global.extraVolumes }}
+      {{- end }}{{- if $.Values.global.extraVolumes }}
       {{- include "helpers.tplvalues.render" ( dict "value" $.Values.global.extraVolumes "context" $) | nindent 6 }}
       {{- end }}
       restartPolicy: {{ .restartPolicy | default "Never" }}

diff --git a/templates/helpers/_volumes.tpl b/templates/helpers/_volumes.tpl
@@ -4,17 +4,33 @@
 {{- if eq .type "configMap" }}
 - name: {{ .name }}
   configMap:
+    {{- with .nameOverride }}
+    name: {{ . }}
+    {{- else }}
     name: {{ include "helpers.app.fullname" (dict "name" .name "context" $ctx) }}
+    {{- end }}
     {{- with .items }}
     items: {{- include "helpers.tplvalues.render" (dict "value" . "context" $ctx) | nindent 4 }}
     {{- end }}
 {{- else if eq .type "secret" }}
 - name: {{ .name }}
   secret:
+    {{- with .nameOverride }}
+    secretName: {{ . }}
+    {{- else }}
     secretName: {{ include "helpers.app.fullname" (dict "name" .name "context" $ctx) }}
+    {{- end }}
     {{- with .items }}
     items: {{- include "helpers.tplvalues.render" (dict "value" . "context" $ctx) | nindent 4 }}
     {{- end }}
+{{- else if eq .type "pvc" }}
+- name: {{ .name }}
+  persistentVolumeClaim:
+    {{- with .nameOverride }}
+    claimName: {{ . }}
+    {{- else }}
+    claimName:  {{ include "helpers.app.fullname" (dict "name" .name "context" $ctx) }}
+    {{- end }}
 {{- end }}
 {{- end }}
 {{- end -}}
diff --git a/templates/job.yml b/templates/job.yml
@@ -262,21 +262,14 @@ spec:
         {{- end }}
       {{- end }}
       volumes:
-      {{- if .templatedVolumes }}
-      {{- include "helpers.volumes.templated" ( dict "volumes" .templatedVolumes "context" $) | indent 6}}
-      {{- end }}
-      {{- range $.Values.pvcs }}
-      {{- $claimName := "" -}}
-      {{- if .nameOverride -}}{{- $claimName = .nameOverride -}}{{- else -}}{{- $claimName = include "helpers.app.fullname" (dict "name" .name "context" $) -}}{{- end }}
-      - name: {{ $claimName }}
-        persistentVolumeClaim:
-          claimName: {{ $claimName }}
+      {{- if .volumes }}
+      {{- include "helpers.volumes.templated" ( dict "volumes" .volumes "context" $) | indent 6}}
       {{- end }}
       {{- if .extraVolumes }}
       {{- include "helpers.tplvalues.render" ( dict "value" .extraVolumes "context" $) | nindent 6 }}
-      {{- else if $general.extraVolumes }}
+      {{- end }}{{- if $general.extraVolumes }}
       {{- include "helpers.tplvalues.render" ( dict "value" $general.extraVolumes "context" $) | nindent 6 }}
-      {{- else if $.Values.generic.extraVolumes }}
+      {{- end }}{{- if $.Values.generic.extraVolumes }}
       {{- include "helpers.tplvalues.render" ( dict "value" $.Values.generic.extraVolumes "context" $) | nindent 6 }}
       {{- end }}
       restartPolicy: {{ .restartPolicy | default "Never" }}

diff --git a/templates/pvc.yml b/templates/pvc.yml
@@ -3,8 +3,8 @@
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
-  {{- if .nameOverride }}
-  name: {{ .nameOverride }}
+  {{- with .claimNameOverride }}
+  name: {{ . }}
   {{- else }}
   name: {{ include "helpers.app.fullname" (dict "name" .name "context" $) }}
   {{- end }}

diff --git a/templates/workers.yml b/templates/workers.yml
@@ -245,22 +245,15 @@ spec:
         {{- end }}
       {{- end }}
       volumes:
-      {{- if .templatedVolumes }}
-      {{- include "helpers.volumes.templated" ( dict "volumes" .templatedVolumes "context" $) | indent 6}}
+      {{- if .volumes }}
+      {{- include "helpers.volumes.templated" ( dict "volumes" .volumes "context" $) | indent 6}}
+      {{- end }}
+      {{- if .extraVolumes }}
+      {{- include "helpers.tplvalues.render" ( dict "value" .extraVolumes "context" $) | nindent 6 }}
+      {{- end }}{{- if $general.extraVolumes }}
+      {{- include "helpers.tplvalues.render" ( dict "value" $general.extraVolumes "context" $) | nindent 6 }}
+      {{- end }}{{- if $.Values.global.extraVolumes }}
+      {{- include "helpers.tplvalues.render" ( dict "value" $.Values.global.extraVolumes "context" $) | nindent 6 }}
       {{- end }}
-        {{- range $.Values.pvcs }}
-        {{- $claimName := "" -}}
-        {{- if .nameOverride -}}{{- $claimName = .nameOverride -}}{{- else -}}{{- $claimName = include "helpers.app.fullname" (dict "name" .name "context" $) -}}{{- end }}
-      - name: {{ $claimName }}
-        persistentVolumeClaim:
-          claimName: {{ $claimName }}
-        {{- end }}
-        {{- if .extraVolumes }}
-        {{- include "helpers.tplvalues.render" ( dict "value" .extraVolumes "context" $) | nindent 8 }}
-        {{- else if $general.extraVolumes }}
-        {{- include "helpers.tplvalues.render" ( dict "value" $general.extraVolumes "context" $) | nindent 8 }}
-        {{- else if $.Values.global.extraVolumes }}
-        {{- include "helpers.tplvalues.render" ( dict "value" $.Values.global.extraVolumes "context" $) | nindent 8 }}
-        {{- end }}
 {{- end }}
 {{- end }}
diff --git a/values.yaml b/values.yaml
@@ -83,9 +83,11 @@ deployments:
       mountPath: /var/lib/secret
     - pvcName: app-pvc
       mountPath: /var/www/html/files
-  templatedVolumes:
+  volumes:
   - name: secret-file
     type: secret
+  - name: app-pvc
+    type: pvc
 
 services:
 - name: nginx
@@ -194,7 +196,7 @@ cronJobs:
     single_only: true
     duration_alert: 600
     max_duration: 800
-    templatedVolumes:
+    volumes:
     - name: secret-file
       type: secret
   - name: auto-sender