Skip to content

Commit fd8c53b

Browse files
MauAraujoMauAraujo
committed
remove unnecessary changes
1 parent 7954d34 commit fd8c53b

File tree

5 files changed

+104
-55
lines changed

5 files changed

+104
-55
lines changed

‎applications/job/templates/cronjob.yaml‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -177,12 +177,24 @@ spec:
177177
readOnly: true
178178
{{ end }}
179179
{{ end }}
180+
{{ if .Values.pvc.enabled }}
181+
volumeMounts:
182+
- name: "{{ include "docker-template.fullname" . }}-storage"
183+
mountPath: {{ .Values.pvc.mountPath }}
184+
{{ end }}
185+
{{- if .Values.multiplePvc.enabled }}
186+
{{- range .Values.multiplePvc.volumes }}
187+
- name: {{ .name }}
188+
mountPath: {{ .mountPath }}
189+
{{- end }}
190+
{{- end }}
191+
180192
{{ if .Values.persistentDisks }}
181193
volumeMounts:
182-
{{- range $v := .Values.persistentDisks }}
194+
{{- range $v := .Values.persistentDisks }}
183195
- name: {{ include "docker-template.persistentDiskName" (dict "name" $v.name) }}
184196
mountPath: {{ include "docker-template.persistentDiskMountPath" (dict "mountPath" $v.mountPath "releaseName" $.Release.Name "diskName" $v.name) }}
185-
{{ end }}
197+
{{ end }}
186198
{{ end }}
187199
resources:
188200
requests:
@@ -254,7 +266,7 @@ spec:
254266
mountPath: /secrets/
255267
readOnly: true
256268
{{ end }}
257-
{{ if or .Values.cloudsql.enabled .Values.fileSecretMounts.enabled .Values.persistentDisks}}
269+
{{ if or .Values.cloudsql.enabled .Values.fileSecretMounts.enabled .Values.pvc.enabled .Values.multiplePvc.enabled .Values.persistentDisks}}
258270
volumes:
259271
{{ if .Values.cloudsql.enabled }}
260272
- name: "cloud-sql-proxy-service-account-secret"

‎applications/web/templates/_helpers.tpl‎

Lines changed: 31 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -129,25 +129,6 @@ Get the EFS resource name. If index is 0, don't append it to the name.
129129
{{- end -}}
130130
{{- end -}}
131131

132-
{{/*
133-
Get the persistent disk mount path for a given volume. If an override is provided, use that.
134-
Otherwise, use the default path /data/<releaseName>/<diskName>
135-
*/}}
136-
{{- define "docker-template.persistentDiskMountPath" -}}
137-
{{- if .mountPath -}}
138-
{{- .mountPath -}}
139-
{{- else -}}
140-
{{- printf "/data/%s/%s" .releaseName .diskName -}}
141-
{{- end -}}
142-
{{- end -}}
143-
144-
{{/*
145-
Get the persistent disk resource name using the disk name
146-
*/}}
147-
{{- define "docker-template.persistentDiskName" -}}
148-
{{- .name -}}
149-
{{- end -}}
150-
151132
{{/*
152133
Renders the full block of annotations for the ingress.
153134
This helper uses the global .Values object.
@@ -193,3 +174,34 @@ This helper uses the global .Values object.
193174
{{- end }}
194175

195176
{{- end -}}
177+
178+
{{/*
179+
Return true if volumeMounts should be rendered in the main container
180+
181+
*/}}
182+
{{- define "web.shouldRenderVolumeMounts" -}}
183+
{{- if or .Values.datadogSocketVolume.enabled .Values.resources.requests.nvidiaGpu .Values.awsEfsStorage .Values.pvc.enabled .Values.multiplePvc.enabled .Values.emptyDir.enabled (and .Values.fileSecretMounts .Values.fileSecretMounts.enabled) -}}
184+
true
185+
{{- else -}}
186+
false
187+
{{- end -}}
188+
{{- end -}}
189+
190+
{{/*
191+
Get the persistent disk mount path for a given volume. If an override is provided, use that.
192+
Otherwise, use the default path /data/<releaseName>/<diskName>
193+
*/}}
194+
{{- define "docker-template.persistentDiskMountPath" -}}
195+
{{- if .mountPath -}}
196+
{{- .mountPath -}}
197+
{{- else -}}
198+
{{- printf "/data/%s/%s" .releaseName .diskName -}}
199+
{{- end -}}
200+
{{- end -}}
201+
202+
{{/*
203+
Get the persistent disk resource name using the disk name
204+
*/}}
205+
{{- define "docker-template.persistentDiskName" -}}
206+
{{- .name -}}
207+
{{- end -}}

‎applications/web/templates/deployment.yaml‎

Lines changed: 22 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -431,23 +431,14 @@ spec:
431431
{{- if .Values.resources.requests.nvidiaGpu}}
432432
- name: dshm
433433
mountPath: /dev/shm
434-
{{ end }}
435-
{{ if .Values.awsEfsStorage }}
436-
volumeMounts:
437-
{{- range $index, $v := .Values.awsEfsStorage }}
438-
- name: {{ include "docker-template.efsName" (dict "fullname" $.Values.fullnameOverride "index" $index) }}
439-
mountPath: {{ include "docker-template.efsMountPath" (dict "mountPath" $v.mountPath "fullname" $.Values.fullnameOverride) }}
440-
{{ end }}
441-
{{ end }}
442-
{{ if .Values.persistentDisks }}
443-
volumeMounts:
444-
{{- range $v := .Values.persistentDisks }}
445-
- name: {{ include "docker-template.persistentDiskName" (dict "name" $v.name) }}
446-
mountPath: {{ include "docker-template.persistentDiskMountPath" (dict "mountPath" $v.mountPath "releaseName" $.Release.Name "diskName" $v.name) }}
447-
{{ end }}
448-
{{ end }}
449-
{{ if .Values.pvc.enabled }}
450-
volumeMounts:
434+
{{ end }}
435+
{{- if .Values.awsEfsStorage }}
436+
{{ range $index, $v := .Values.awsEfsStorage }}
437+
- name: {{ include "docker-template.efsName" (dict "fullname" $.Values.fullnameOverride "index" $index) }}
438+
mountPath: {{ include "docker-template.efsMountPath" (dict "mountPath" $v.mountPath "fullname" $.Values.fullnameOverride) }}
439+
{{ end }}
440+
{{ end }}
441+
{{- if .Values.pvc.enabled }}
451442
- name: "{{ include "docker-template.fullname" . }}-storage"
452443
mountPath: {{ .Values.pvc.mountPath }}
453444
{{ end }}
@@ -468,6 +459,12 @@ spec:
468459
readOnly: true
469460
{{ end }}
470461
{{ end }}
462+
{{ if .Values.persistentDisks }}
463+
{{- range $v := .Values.persistentDisks }}
464+
- name: {{ include "docker-template.persistentDiskName" (dict "name" $v.name) }}
465+
mountPath: {{ include "docker-template.persistentDiskMountPath" (dict "mountPath" $v.mountPath "releaseName" $.Release.Name "diskName" $v.name) }}
466+
{{ end }}
467+
{{ end }}
471468
{{ end }}
472469
{{- if .Values.cloudsql.enabled }}
473470
- name: cloud-sql-proxy
@@ -536,7 +533,7 @@ spec:
536533
{{- end }}
537534
{{- end }}
538535
{{ end }}
539-
{{ if or .Values.pvc.enabled .Values.resources.requests.nvidiaGpu .Values.cloudsql.enabled .Values.emptyDir.enabled .Values.fileSecretMounts.enabled .Values.awsEfsStorage .Values.persistentDisks .Values.datadogSocketVolume.enabled }}
536+
{{ if or .Values.pvc.enabled .Values.multiplePvc.enabled .Values.resources.requests.nvidiaGpu .Values.cloudsql.enabled .Values.emptyDir.enabled .Values.fileSecretMounts.enabled .Values.awsEfsStorage .Values.datadogSocketVolume.enabled .Values.persistentDisks}}
540537
volumes:
541538
{{ if .Values.datadogSocketVolume.enabled }}
542539
- hostPath:
@@ -587,19 +584,19 @@ spec:
587584
claimName: {{ include "docker-template.efsName" (dict "fullname" $.Values.fullnameOverride "index" $index) }}
588585
{{ end }}
589586
{{ end }}
590-
{{ if .Values.persistentDisks }}
591-
{{- range $v := .Values.persistentDisks }}
592-
- name: {{ include "docker-template.persistentDiskName" (dict "name" $v.name) }}
593-
persistentVolumeClaim:
594-
claimName: {{ include "docker-template.persistentDiskName" (dict "name" $v.name) }}
595-
{{ end }}
596-
{{ end }}
597587
{{ if .Values.fileSecretMounts.enabled }}
598588
{{ range .Values.fileSecretMounts.mounts }}
599589
- name: {{ .mountPath }}
600590
secret:
601591
secretName: "{{ .secretName }}"
602592
{{ end }}
603593
{{ end }}
594+
{{ if .Values.persistentDisks }}
595+
{{- range $v := .Values.persistentDisks }}
596+
- name: {{ include "docker-template.persistentDiskName" (dict "name" $v.name) }}
597+
persistentVolumeClaim:
598+
claimName: {{ include "docker-template.persistentDiskName" (dict "name" $v.name) }}
599+
{{ end }}
600+
{{ end }}
604601
{{ end }}
605602
{{- end }}

‎applications/worker/templates/_helpers.tpl‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,17 @@ For backwards compatibility, this concatenates targets from cloudsql.connectionN
9797
{{- end }}
9898
{{- end }}
9999

100+
{{/*
101+
Return true if volumeMounts should be rendered in the main container
102+
*/}}
103+
{{- define "worker.shouldRenderVolumeMounts" -}}
104+
{{- if or .Values.datadogSocketVolume.enabled .Values.pvc.enabled .Values.multiplePvc.enabled .Values.emptyDir.enabled (and .Values.fileSecretMounts .Values.fileSecretMounts.enabled) .Values.additionalVolumes -}}
105+
true
106+
{{- else -}}
107+
false
108+
{{- end -}}
109+
{{- end -}}
110+
100111
{{/*
101112
Get the persistent disk mount path for a given volume. If an override is provided, use that.
102113
Otherwise, use the default path /data/<releaseName>/<diskName>

‎applications/worker/templates/deployment.yaml‎

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -328,13 +328,30 @@ spec:
328328
- name: {{ .name }}
329329
mountPath: {{ .mountPath }}
330330
{{- end }}
331-
{{ end }}
332-
{{ if .Values.persistentDisks }}
333-
volumeMounts:
334-
{{- range $v := .Values.persistentDisks }}
335-
- name: {{ include "docker-template.persistentDiskName" (dict "name" $v.name) }}
336-
mountPath: {{ include "docker-template.persistentDiskMountPath" (dict "mountPath" $v.mountPath "releaseName" $.Release.Name "diskName" $v.name) }}
337-
{{ end }}
331+
{{- end }}
332+
{{- if .Values.emptyDir.enabled }}
333+
- name: "{{ include "docker-template.fullname" . }}-empty-dir-storage"
334+
mountPath: {{ .Values.emptyDir.mountPath }}
335+
{{ end }}
336+
{{- if and .Values.fileSecretMounts .Values.fileSecretMounts.enabled }}
337+
{{ range .Values.fileSecretMounts.mounts }}
338+
- name: {{ .mountPath }}
339+
mountPath: "/etc/secrets/{{ .mountPath }}"
340+
readOnly: true
341+
{{ end }}
342+
{{ end }}
343+
{{- if .Values.additionalVolumes }}
344+
{{ range .Values.additionalVolumes }}
345+
- name: {{ .name }}
346+
mountPath: {{ .mountPath }}
347+
{{ end }}
348+
{{ end }}
349+
{{ if .Values.persistentDisks }}
350+
{{- range $v := .Values.persistentDisks }}
351+
- name: {{ include "docker-template.persistentDiskName" (dict "name" $v.name) }}
352+
mountPath: {{ include "docker-template.persistentDiskMountPath" (dict "mountPath" $v.mountPath "releaseName" $.Release.Name "diskName" $v.name) }}
353+
{{ end }}
354+
{{ end }}
338355
{{ end }}
339356
{{- if .Values.cloudsql.enabled }}
340357
- name: cloud-sql-proxy
@@ -403,7 +420,7 @@ spec:
403420
{{- end }}
404421
{{- end }}
405422
{{ end }}
406-
{{ if or .Values.pvc.enabled .Values.cloudsql.enabled .Values.emptyDir.enabled .Values.datadogSocketVolume.enabled .Values.fileSecretMounts.enabled (and .Values.additionalVolumes (not (empty .Values.additionalVolumes))) .Values.persistentDisks }}
423+
{{ if or .Values.pvc.enabled .Values.multiplePvc.enabled .Values.cloudsql.enabled .Values.emptyDir.enabled .Values.datadogSocketVolume.enabled .Values.fileSecretMounts.enabled (and .Values.additionalVolumes (not (empty .Values.additionalVolumes))) .Values.persistentDisks}}
407424
volumes:
408425
{{ if .Values.datadogSocketVolume.enabled }}
409426
- hostPath:

0 commit comments

Comments
 (0)