Add support for custom environment variables on the Nginx Controller …

…container (#3326) Co-authored-by: Shaun <[email protected]>
nginx · Jan 24, 2023 · d443d3a · d443d3a
1 parent fccf1c4
commit d443d3a
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 0 deletions.
diff --git a/deployments/helm-chart/README.md b/deployments/helm-chart/README.md
@@ -178,6 +178,7 @@ Parameter | Description | Default
 `controller.tolerations` | The tolerations of the Ingress Controller pods. | []
 `controller.affinity` | The affinity of the Ingress Controller pods. | {}
 `controller.topologySpreadConstraints` | The topology spread constraints of the Ingress controller pods. | {}
+`controller.env` | The additional environment variables to be set on the Ingress Controller pods. | []
 `controller.volumes` | The volumes of the Ingress Controller pods. | []
 `controller.volumeMounts` | The volumeMounts of the Ingress Controller pods. | []
 `controller.initContainers` | InitContainers for the Ingress Controller pods. | []

diff --git a/deployments/helm-chart/templates/controller-daemonset.yaml b/deployments/helm-chart/templates/controller-daemonset.yaml
@@ -136,6 +136,9 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.name
+{{- if .Values.controller.env }}
+{{ toYaml .Values.controller.env | indent 8 }}
+{{- end }}
 {{- if .Values.nginxServiceMesh.enable }}
         - name: POD_SERVICEACCOUNT
           valueFrom:

diff --git a/deployments/helm-chart/templates/controller-deployment.yaml b/deployments/helm-chart/templates/controller-deployment.yaml
@@ -141,6 +141,9 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.name
+{{- if .Values.controller.env }}
+{{ toYaml .Values.controller.env | indent 8 }}
+{{- end }}
 {{- if .Values.nginxServiceMesh.enable }}
         - name: POD_SERVICEACCOUNT
           valueFrom:

diff --git a/deployments/helm-chart/values.schema.json b/deployments/helm-chart/values.schema.json
@@ -460,6 +460,15 @@
           "title": "The topologySpreadConstraints Schema",
           "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.25.4/_definitions.json#/definitions/io.k8s.api.core.v1.TopologySpreadConstraint"
         },
+        "env": {
+          "type": "array",
+          "default": [],
+          "title": "The env Schema",
+          "items": {
+            "type": "object",
+            "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.25.4/_definitions.json#/definitions/io.k8s.api.core.v1.EnvVar"
+          }
+        },
         "volumes": {
           "type": "array",
           "default": [],
@@ -1274,6 +1283,7 @@
           "tolerations": [],
           "affinity": {},
           "topologySpreadConstraints": {},
+          "env": [],
           "volumes": [],
           "volumeMounts": [],
           "initContainers": [],
@@ -1574,6 +1584,7 @@
         "tolerations": [],
         "affinity": {},
         "topologySpreadConstraints": {},
+        "env": [],
         "volumes": [],
         "volumeMounts": [],
         "initContainers": [],

diff --git a/deployments/helm-chart/values.yaml b/deployments/helm-chart/values.yaml
@@ -153,6 +153,11 @@ controller:
   ## The topology spread constraints of the Ingress controller pods.
   # topologySpreadConstraints: {}
 
+  ## The additional environment variables to be set on the Ingress Controller pods.
+  env: []
+  # - name: MY_VAR
+  #   value: myvalue
+
   ## The volumes of the Ingress Controller pods.
   volumes: []
   # - name: extra-conf

diff --git a/docs/content/installation/installation-with-helm.md b/docs/content/installation/installation-with-helm.md
@@ -177,6 +177,7 @@ The following tables lists the configurable parameters of the NGINX Ingress Cont
 |``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.env`` | The additional environment variables to be set on the Ingress Controller pods. | []
 |``controller.volumes`` | The volumes of the Ingress Controller pods. | [] |
 |``controller.volumeMounts`` | The volumeMounts of the Ingress Controller pods. | [] |
 |``controller.initContainers`` | InitContainers for the Ingress Controller pods. | []