refactor volumes and volumeMounts to common helpers

nginx · Feb 23, 2024 · 4e891d9 · 4e891d9
1 parent 19671a5
commit 4e891d9
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 65 deletions.
diff --git a/charts/nginx-ingress/templates/_helpers.tpl b/charts/nginx-ingress/templates/_helpers.tpl
@@ -162,7 +162,7 @@ Build the args for the service binary.
 - --continue
 {{- end }}
 - --
-{{- end }}
+{{- end -}}
 - -nginx-plus={{ .Values.controller.nginxplus }}
 - -nginx-reload-timeout={{ .Values.controller.nginxReloadTimeout }}
 - -enable-app-protect={{ .Values.controller.appprotect.enable }}
@@ -250,3 +250,47 @@ Build the args for the service binary.
 - -ssl-dynamic-reload={{ .Values.controller.enableSSLDynamicReload }}
 - -enable-telemetry-reporting={{ .Values.controller.enableTelemetryReporting}}
 {{- end -}}
+
+{{/*
+Volumes for controller.
+*/}}
+{{- define "nginx-ingress.volumes" -}}
+{{- if or (eq (include "nginx-ingress.readOnlyRootFilesystem" .) "true" ) .Values.controller.volumes }}
+volumes:
+{{- end }}
+{{- if eq (include "nginx-ingress.readOnlyRootFilesystem" .) "true" }}
+- name: nginx-etc
+  emptyDir: {}
+- name: nginx-cache
+  emptyDir: {}
+- name: nginx-lib
+  emptyDir: {}
+- name: nginx-log
+  emptyDir: {}
+{{- end }}
+{{- if .Values.controller.volumes }}
+{{ toYaml .Values.controller.volumes }}
+{{- end }}
+{{- end -}}
+
+{{/*
+Volume mounts for controller.
+*/}}
+{{- define "nginx-ingress.volumeMounts" -}}
+{{- if or ( eq (include "nginx-ingress.readOnlyRootFilesystem" .) "true" ) .Values.controller.volumeMounts }}
+volumeMounts:
+{{- end }}
+{{- if eq (include "nginx-ingress.readOnlyRootFilesystem" .) "true" }}
+- mountPath: /etc/nginx
+  name: nginx-etc
+- mountPath: /var/cache/nginx
+  name: nginx-cache
+- mountPath: /var/lib/nginx
+  name: nginx-lib
+- mountPath: /var/log/nginx
+  name: nginx-log
+{{- end }}
+{{- if .Values.controller.volumeMounts}}
+{{ toYaml .Values.controller.volumeMounts }}
+{{- end }}
+{{- end -}}
diff --git a/charts/nginx-ingress/templates/controller-daemonset.yaml b/charts/nginx-ingress/templates/controller-daemonset.yaml
@@ -54,22 +54,7 @@ spec:
       affinity:
 {{ toYaml .Values.controller.affinity | indent 8 }}
 {{- end }}
-{{- if or (eq (include "nginx-ingress.readOnlyRootFilesystem" .) "true" ) .Values.controller.volumes }}
-      volumes:
-{{- end }}
-{{- if eq (include "nginx-ingress.readOnlyRootFilesystem" .) "true" }}
-      - name: nginx-etc
-        emptyDir: {}
-      - name: nginx-cache
-        emptyDir: {}
-      - name: nginx-lib
-        emptyDir: {}
-      - name: nginx-log
-        emptyDir: {}
-{{- end }}
-{{- if .Values.controller.volumes }}
-{{ toYaml .Values.controller.volumes | indent 6 }}
-{{- end }}
+{{- include "nginx-ingress.volumes" . | indent 6 }}
 {{- if .Values.controller.priorityClassName }}
       priorityClassName: {{ .Values.controller.priorityClassName }}
 {{- end }}
@@ -131,22 +116,7 @@ spec:
             add:
             - NET_BIND_SERVICE
 {{- end }}
-{{- if or (eq (include "nginx-ingress.readOnlyRootFilesystem" .) "true" ) .Values.controller.volumeMounts }}
-        volumeMounts:
-{{- end }}
-{{- if eq (include "nginx-ingress.readOnlyRootFilesystem" .) "true" }}
-        - mountPath: /etc/nginx
-          name: nginx-etc
-        - mountPath: /var/cache/nginx
-          name: nginx-cache
-        - mountPath: /var/lib/nginx
-          name: nginx-lib
-        - mountPath: /var/log/nginx
-          name: nginx-log
-{{- end }}
-{{- if .Values.controller.volumeMounts }}
-{{ toYaml .Values.controller.volumeMounts | indent 8 }}
-{{- end }}
+{{- include "nginx-ingress.volumeMounts" . | indent 8 }}
         env:
         - name: POD_NAMESPACE
           valueFrom:

diff --git a/charts/nginx-ingress/templates/controller-deployment.yaml b/charts/nginx-ingress/templates/controller-deployment.yaml
@@ -56,22 +56,7 @@ spec:
       topologySpreadConstraints:
 {{ toYaml .Values.controller.topologySpreadConstraints | indent 8 }}
 {{- end }}
-{{- if or (eq (include "nginx-ingress.readOnlyRootFilesystem" .) "true") .Values.controller.volumes }}
-      volumes:
-{{- end }}
-{{- if eq (include "nginx-ingress.readOnlyRootFilesystem" .) "true" }}
-      - name: nginx-etc
-        emptyDir: {}
-      - name: nginx-cache
-        emptyDir: {}
-      - name: nginx-lib
-        emptyDir: {}
-      - name: nginx-log
-        emptyDir: {}
-{{- end }}
-{{- if .Values.controller.volumes }}
-{{ toYaml .Values.controller.volumes | indent 6 }}
-{{- end }}
+{{- include "nginx-ingress.volumes" .  | indent 6 }}
 {{- if .Values.controller.priorityClassName }}
       priorityClassName: {{ .Values.controller.priorityClassName }}
 {{- end }}
@@ -140,22 +125,7 @@ spec:
             add:
             - NET_BIND_SERVICE
 {{- end }}
-{{- if or ( eq (include "nginx-ingress.readOnlyRootFilesystem" .) "true" ) .Values.controller.volumeMounts }}
-        volumeMounts:
-{{- end }}
-{{- if eq (include "nginx-ingress.readOnlyRootFilesystem" .) "true" }}
-        - mountPath: /etc/nginx
-          name: nginx-etc
-        - mountPath: /var/cache/nginx
-          name: nginx-cache
-        - mountPath: /var/lib/nginx
-          name: nginx-lib
-        - mountPath: /var/log/nginx
-          name: nginx-log
-{{- end }}
-{{- if .Values.controller.volumeMounts}}
-{{ toYaml .Values.controller.volumeMounts | indent 8 }}
-{{- end }}
+{{- include "nginx-ingress.volumeMounts" . | indent 8 }}
         env:
         - name: POD_NAMESPACE
           valueFrom: