diff --git a/deployments/helm-chart/README.md b/deployments/helm-chart/README.md index 94d25bced0..da7aad89b1 100644 --- a/deployments/helm-chart/README.md +++ b/deployments/helm-chart/README.md @@ -138,6 +138,8 @@ Parameter | Description | Default `controller.terminationGracePeriodSeconds` | The termination grace period of the Ingress controller pod. | 30 `controller.tolerations` | The tolerations of the Ingress controller pods. | [] `controller.affinity` | The affinity of the Ingress controller pods. | {} +`controller.volumes` | The volumes of the Ingress controller pods. | [] +`controller.volumeMounts` | The volumeMounts of the Ingress controller pods. | [] `controller.resources` | The resources of the Ingress controller pods. | {} `controller.replicaCount` | The number of replicas of the Ingress controller deployment. | 1 `controller.ingressClass` | A class of the Ingress controller. The Ingress controller only processes Ingress resources that belong to its class - i.e. have the annotation `"kubernetes.io/ingress.class"` equal to the class. Additionally, the Ingress controller processes Ingress resources that do not have that annotation which can be disabled by setting the "-use-ingress-class-only" flag. | nginx diff --git a/deployments/helm-chart/templates/controller-daemonset.yaml b/deployments/helm-chart/templates/controller-daemonset.yaml index 1e18373fe1..677c160f52 100644 --- a/deployments/helm-chart/templates/controller-daemonset.yaml +++ b/deployments/helm-chart/templates/controller-daemonset.yaml @@ -39,6 +39,10 @@ spec: affinity: {{ toYaml .Values.controller.affinity | indent 8 }} {{- end }} +{{- if .Values.controller.volumes }} + volumes: +{{ toYaml .Values.controller.volumes | indent 6 }} +{{- end }} {{- if .Values.controller.priorityClassName }} priorityClassName: {{ .Values.controller.priorityClassName }} {{- end }} @@ -69,6 +73,10 @@ spec: - ALL add: - NET_BIND_SERVICE +{{- if .Values.controller.volumeMounts }} + volumeMounts: +{{ toYaml .Values.controller.volumeMounts | indent 8 }} +{{- end }} env: - name: POD_NAMESPACE valueFrom: diff --git a/deployments/helm-chart/templates/controller-deployment.yaml b/deployments/helm-chart/templates/controller-deployment.yaml index 642e4aac00..003208dec1 100644 --- a/deployments/helm-chart/templates/controller-deployment.yaml +++ b/deployments/helm-chart/templates/controller-deployment.yaml @@ -38,6 +38,10 @@ spec: affinity: {{ toYaml .Values.controller.affinity | indent 8 }} {{- end }} +{{- if .Values.controller.volumes }} + volumes: +{{ toYaml .Values.controller.volumes | indent 6 }} +{{- end }} {{- if .Values.controller.priorityClassName }} priorityClassName: {{ .Values.controller.priorityClassName }} {{- end }} @@ -69,6 +73,10 @@ spec: - ALL add: - NET_BIND_SERVICE +{{- if .Values.controller.volumeMounts }} + volumeMounts: +{{ toYaml .Values.controller.volumeMounts | indent 8 }} +{{- end }} env: - name: POD_NAMESPACE valueFrom: diff --git a/deployments/helm-chart/values.yaml b/deployments/helm-chart/values.yaml index 05d4100d21..4f74a4378a 100644 --- a/deployments/helm-chart/values.yaml +++ b/deployments/helm-chart/values.yaml @@ -89,6 +89,18 @@ controller: ## The affinity of the Ingress controller pods. affinity: {} + ## The volumes of the Ingress controller pods. + volumes: [] + # - name: extra-conf + # configMap: + # name: extra-conf + + ## The volumeMounts of the Ingress controller pods. + volumeMounts: [] + # - name: extra-conf + # mountPath: /etc/nginx/conf.d/extra.conf + # subPath: extra.conf + ## The number of replicas of the Ingress controller deployment. replicaCount: 1 diff --git a/docs-web/installation/installation-with-helm.md b/docs-web/installation/installation-with-helm.md index e8dda0ef80..1d7aba578f 100644 --- a/docs-web/installation/installation-with-helm.md +++ b/docs-web/installation/installation-with-helm.md @@ -184,6 +184,12 @@ The following tables lists the configurable parameters of the NGINX Ingress cont * - ``controller.affinity`` - The affinity of the Ingress controller pods. - {} + * - ``controller.volumes`` + - The volumes of the Ingress controller pods. + - [] + * - ``controller.volumeMounts`` + - The volumeMounts of the Ingress controller pods. + - [] * - ``controller.resources`` - The resources of the Ingress controller pods. - {}