Skip to content

Commit

Permalink
templated volumes
Browse files Browse the repository at this point in the history
  • Loading branch information
Roman Andreev committed Jan 26, 2022
1 parent 4459d37 commit 7700450
Show file tree
Hide file tree
Showing 7 changed files with 63 additions and 192 deletions.
37 changes: 2 additions & 35 deletions templates/cronjob.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ spec:
{{ if or $.Values.generic.imagePullSecrets .imagePullSecrets }}
imagePullSecrets:
{{- range $sName, $v := $.Values.generic.imagePullSecrets }}
- name: {{ $sName }}
- name: {{ $sName }}
{{- end }}
{{- if .imagePullSecrets }}
{{- include "helpers.tplvalues.render" ( dict "value" .imagePullSecrets "context" $) | nindent 12 }}
Expand Down Expand Up @@ -285,41 +285,8 @@ spec:
{{- end }}
{{- end }}
volumes:
{{- if $.Files.Glob ("extra-files/config/**") }}
{{- range $subPath := splitList "$" (include "helpers.configFiles.subPaths" $)}}
{{- $name := include "helpers.app.fullname" (dict "name" ($subPath | replace "_" "-" | replace "." "-") "context" $) }}
- name: {{ $name }}
configMap:
name: {{ $name }}
{{- end }}
{{- end }}
{{- if $.Files.Glob ("extra-files/secret/**") }}
{{- range $subPath := splitList "$" (include "helpers.configFiles.subPaths" $)}}
{{- $name := include "helpers.app.fullname" (dict "name" ($subPath | replace "_" "-" | replace "." "-") "context" $) }}
- name: {{ $name }}
secret:
secretName: {{ $name }}
{{- end }}
{{- end }}
{{- if .templatedVolumes }}
{{- range .templatedVolumes }}
{{- if eq .type "configMap" }}
- name: {{ include "helpers.app.fullname" (dict "name" .name "context" $) }}
configMap:
name: {{ include "helpers.app.fullname" (dict "name" .name "context" $) }}
{{- with .items }}
items: {{- include "helpers.tplvalues.render" (dict "value" . "context" $) | nindent 16 }}
{{- end }}
{{- end }}
{{- if eq .type "secret" }}
- name: {{ include "helpers.app.fullname" (dict "name" .templatedName "context" $) }}
secret:
secretName: {{ include "helpers.app.fullname" (dict "name" .templatedName "context" $) }}
{{- with .items }}
items: {{- include "helpers.tplvalues.render" (dict "value" . "context" $) | nindent 16 }}
{{- end }}
{{- end }}
{{- end }}
{{- include "helpers.volumes.templated" ( dict "volumes" .templatedVolumes "context" $) | indent 10}}
{{- end }}
{{- range $.Values.pvcs }}
{{- $claimName := "" -}}
Expand Down
80 changes: 24 additions & 56 deletions templates/deployment.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ spec:
{{ if or $.Values.generic.imagePullSecrets .imagePullSecrets }}
imagePullSecrets:
{{- range $sName, $v := $.Values.generic.imagePullSecrets }}
- name: {{ $sName }}
- name: {{ $sName }}
{{- end }}
{{- if .imagePullSecrets }}
{{- include "helpers.tplvalues.render" ( dict "value" .imagePullSecrets "context" $) | nindent 8 }}
Expand Down Expand Up @@ -214,74 +214,42 @@ spec:
volumeMounts:
{{- range $volMounts }}
{{- if .extraFilesDirName }}
- name: {{ include "helpers.app.fullname" (dict "name" (.extraFilesDirName | replace "_" "-" | replace "." "-") "context" $) }}
- name: {{ include "helpers.app.fullname" (dict "name" (.extraFilesDirName | replace "_" "-" | replace "." "-") "context" $) }}
{{- else if .pvcName }}
- name: {{ include "helpers.app.fullname" (dict "name" .pvcName "context" $) }}
- name: {{ include "helpers.app.fullname" (dict "name" .pvcName "context" $) }}
{{- else if .templatedName }}
- name: {{ include "helpers.app.fullname" (dict "name" .templatedName "context" $) }}
- name: {{ include "helpers.app.fullname" (dict "name" .templatedName "context" $) }}
{{- else }}
- name: {{ .name }}
- name: {{ .name }}
{{- end }}
{{- with .subPath }}
subPath: {{ include "helpers.tplvalues.render" ( dict "value" . "context" $) }}
subPath: {{ include "helpers.tplvalues.render" ( dict "value" . "context" $) }}
{{- end }}
{{- with .subPathExpr }}
subPathExpr: {{ include "helpers.tplvalues.render" ( dict "value" . "context" $) }}
subPathExpr: {{ include "helpers.tplvalues.render" ( dict "value" . "context" $) }}
{{- end }}
mountPath: {{ .mountPath }}
mountPath: {{ .mountPath }}
{{- with .readOnly }}
readOnly: {{ include "helpers.tplvalues.render" ( dict "value" . "context" $) }}
readOnly: {{ include "helpers.tplvalues.render" ( dict "value" . "context" $) }}
{{- end }}
{{- end }}
{{- end }}
{{- end }}
volumes:
{{- if $.Files.Glob ("extra-files/config/**") }}
{{- range $subPath := splitList "$" (include "helpers.configFiles.subPaths" $)}}
{{- $name := include "helpers.app.fullname" (dict "name" ($subPath | replace "_" "-" | replace "." "-") "context" $) }}
- name: {{ $name }}
configMap:
name: {{ $name }}
{{- end }}
{{- end }}
{{- if $.Files.Glob ("extra-files/secret/**") }}
{{- range $subPath := splitList "$" (include "helpers.configFiles.subPaths" $)}}
{{- $name := include "helpers.app.fullname" (dict "name" ($subPath | replace "_" "-" | replace "." "-") "context" $) }}
- name: {{ $name }}
secret:
secretName: {{ $name }}
{{- end }}
{{- end }}
{{- range .templatedVolumes }}
{{- $volName := include "helpers.app.fullname" (dict "name" .templatedName "context" $) -}}
{{- if eq .type "configMap" }}
- name: {{ $volName }}
configMap:
name: {{ $volName }}
{{- with .items }}
items: {{- include "helpers.tplvalues.render" (dict "value" . "context" $) | nindent 14 }}
{{- end }}
{{- end }}
{{- if eq .type "secret" }}
- name: {{ $volName }}
secret:
secretName: {{ $volName }}
{{- with .items }}
items: {{- include "helpers.tplvalues.render" (dict "value" . "context" $) | nindent 14 }}
{{- end }}
{{- end }}
{{- 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 $.Values.generic.extraVolumes }}
{{- include "helpers.tplvalues.render" ( dict "value" $.Values.generic.extraVolumes "context" $) | nindent 8 }}
{{- end }}
{{- 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 }}
{{- end }}
{{- if .extraVolumes }}
{{- include "helpers.tplvalues.render" ( dict "value" .extraVolumes "context" $) | nindent 6 }}
{{- else if $.Values.generic.extraVolumes }}
{{- include "helpers.tplvalues.render" ( dict "value" $.Values.generic.extraVolumes "context" $) | nindent 6 }}
{{- end }}
{{- end }}
{{- end }}
30 changes: 4 additions & 26 deletions templates/helm-hooks.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -249,20 +249,9 @@ spec:
{{- end }}
{{- end }}
volumes:
{{- if .volumes }}
{{- range .volumes }}
{{- if eq .type "configMap" }}
- name: {{ include "helpers.app.fullname" (dict "name" .name "context" $) }}
configMap:
name: {{ include "helpers.app.fullname" (dict "name" .name "context" $) }}
{{- if .templatedVolumes }}
{{- include "helpers.volumes.templated" ( dict "volumes" .templatedVolumes "context" $) | indent 6}}
{{- end }}
{{- if eq .type "secret" }}
- name: {{ include "helpers.app.fullname" (dict "name" .name "context" $) }}
secret:
secretName: {{ include "helpers.app.fullname" (dict "name" .name "context" $) }}
{{- end }}
{{- end }}
{{- end }}
{{- if .extraVolumes }}
{{- include "helpers.tplvalues.render" ( dict "value" .extraVolumes "context" $) | nindent 6 }}
{{- else if $general.extraVolumes }}
Expand Down Expand Up @@ -485,19 +474,8 @@ spec:
{{- end }}
{{- end }}
volumes:
{{- if .volumes }}
{{- range .volumes }}
{{- if eq .type "configMap" }}
- name: {{ include "helpers.app.fullname" (dict "name" .name "context" $) }}
configMap:
name: {{ include "helpers.app.fullname" (dict "name" .name "context" $) }}
{{- end }}
{{- if eq .type "secret" }}
- name: {{ include "helpers.app.fullname" (dict "name" .name "context" $) }}
secret:
secretName: {{ include "helpers.app.fullname" (dict "name" .name "context" $) }}
{{- end }}
{{- end }}
{{- if .templatedVolumes }}
{{- include "helpers.volumes.templated" ( dict "volumes" .templatedVolumes "context" $) | indent 6}}
{{- end }}
{{- if .extraVolumes }}
{{- include "helpers.tplvalues.render" ( dict "value" .extraVolumes "context" $) | nindent 6 }}
Expand Down
20 changes: 20 additions & 0 deletions templates/helpers/_volumes.tpl
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{{- define "helpers.volumes.templated" -}}
{{- $ctx := .context }}
{{- range .volumes }}
{{- if eq .type "configMap" }}
- name: {{ .name }}
configMap:
name: {{ include "helpers.app.fullname" (dict "name" .name "context" $ctx) }}
{{- with .items }}
items: {{- include "helpers.tplvalues.render" (dict "value" . "context" $ctx) | nindent 4 }}
{{- end }}
{{- else if eq .type "secret" }}
- name: {{ .name }}
secret:
secretName: {{ include "helpers.app.fullname" (dict "name" .name "context" $ctx) }}
{{- with .items }}
items: {{- include "helpers.tplvalues.render" (dict "value" . "context" $ctx) | nindent 4 }}
{{- end }}
{{- end }}
{{- end }}
{{- end -}}
37 changes: 2 additions & 35 deletions templates/job.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -262,41 +262,8 @@ spec:
{{- end }}
{{- end }}
volumes:
{{- if $.Files.Glob ("extra-files/config/**") }}
{{- range $subPath := splitList "$" (include "helpers.configFiles.subPaths" $)}}
{{- $name := include "helpers.app.fullname" (dict "name" ($subPath | replace "_" "-" | replace "." "-") "context" $) }}
- name: {{ $name }}
configMap:
name: {{ $name }}
{{- end }}
{{- end }}
{{- if $.Files.Glob ("extra-files/secret/**") }}
{{- range $subPath := splitList "$" (include "helpers.configFiles.subPaths" $)}}
{{- $name := include "helpers.app.fullname" (dict "name" ($subPath | replace "_" "-" | replace "." "-") "context" $) }}
- name: {{ $name }}
secret:
secretName: {{ $name }}
{{- end }}
{{- end }}
{{- if .volumes }}
{{- range .volumes }}
{{- if eq .type "configMap" }}
- name: {{ include "helpers.app.fullname" (dict "name" .name "context" $) }}
configMap:
name: {{ include "helpers.app.fullname" (dict "name" .name "context" $) }}
{{- with .items }}
items: {{- include "helpers.tplvalues.render" (dict "value" . "context" $) | nindent 12 }}
{{- end }}
{{- end }}
{{- if eq .type "secret" }}
- name: {{ include "helpers.app.fullname" (dict "name" .name "context" $) }}
secret:
secretName: {{ include "helpers.app.fullname" (dict "name" .name "context" $) }}
{{- with .items }}
items: {{- include "helpers.tplvalues.render" (dict "value" . "context" $) | nindent 12 }}
{{- end }}
{{- end }}
{{- end }}
{{- if .templatedVolumes }}
{{- include "helpers.volumes.templated" ( dict "volumes" .templatedVolumes "context" $) | indent 6}}
{{- end }}
{{- range $.Values.pvcs }}
{{- $claimName := "" -}}
Expand Down
46 changes: 7 additions & 39 deletions templates/workers.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ spec:
{{ if or $.Values.generic.imagePullSecrets .imagePullSecrets }}
imagePullSecrets:
{{- range $sName, $v := $.Values.generic.imagePullSecrets }}
- name: {{ $sName }}
- name: {{ $sName }}
{{- end }}
{{- if .imagePullSecrets }}
{{- include "helpers.tplvalues.render" ( dict "value" .imagePullSecrets "context" $) | nindent 8 }}
Expand Down Expand Up @@ -245,47 +245,15 @@ spec:
{{- end }}
{{- end }}
volumes:
{{- if $.Files.Glob ("extra-files/config/**") }}
{{- range $subPath := splitList "$" (include "helpers.configFiles.subPaths" $)}}
{{- $name := include "helpers.app.fullname" (dict "name" ($subPath | replace "_" "-" | replace "." "-") "context" $) }}
- name: {{ $name }}
configMap:
name: {{ $name }}
{{- end }}
{{- end }}
{{- if $.Files.Glob ("extra-files/secret/**") }}
{{- range $subPath := splitList "$" (include "helpers.configFiles.subPaths" $)}}
{{- $name := include "helpers.app.fullname" (dict "name" ($subPath | replace "_" "-" | replace "." "-") "context" $) }}
- name: {{ $name }}
secret:
secretName: {{ $name }}
{{- end }}
{{- end }}
{{- range .templatedVolumes }}
{{- $volName := include "helpers.app.fullname" (dict "name" .templatedName "context" $) -}}
{{- if eq .type "configMap" }}
- name: {{ $volName }}
configMap:
name: {{ $volName }}
{{- with .items }}
items: {{- include "helpers.tplvalues.render" (dict "value" . "context" $) | nindent 14 }}
{{- end }}
{{- end }}
{{- if eq .type "secret" }}
- name: {{ $volName }}
secret:
secretName: {{ $volName }}
{{- with .items }}
items: {{- include "helpers.tplvalues.render" (dict "value" . "context" $) | nindent 14 }}
{{- end }}
{{- end }}
{{- end }}
{{- 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 }}
- name: {{ $claimName }}
persistentVolumeClaim:
claimName: {{ $claimName }}
{{- end }}
{{- if .extraVolumes }}
{{- include "helpers.tplvalues.render" ( dict "value" .extraVolumes "context" $) | nindent 8 }}
Expand Down
5 changes: 4 additions & 1 deletion values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ deployments:
- pvcName: app-pvc
mountPath: /var/www/html/files
templatedVolumes:
- templatedName: secret-file
- name: secret-file
type: secret

services:
Expand Down Expand Up @@ -194,6 +194,9 @@ cronJobs:
single_only: true
duration_alert: 600
max_duration: 800
templatedVolumes:
- name: secret-file
type: secret
- name: auto-sender
schedule: "*/5 * * * *"
command: "php yii crontab/auto-sender"
Expand Down

0 comments on commit 7700450

Please sign in to comment.