Merge branch 'main' into feat/path-regex

nginx · Aug 16, 2023 · 5f72b58 · 5f72b58
2 parents d4231f4 + da221ce
commit 5f72b58
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/deployments/helm-chart/README.md b/deployments/helm-chart/README.md
@@ -271,6 +271,7 @@ The following tables lists the configurable parameters of the NGINX Ingress Cont
 |`controller.service.extraLabels` | The extra labels of the service. | {} |
 |`controller.service.loadBalancerIP` | The static IP address for the load balancer. Requires `controller.service.type` set to `LoadBalancer`. The cloud provider must support this feature. | "" |
 |`controller.service.externalIPs` | The list of external IPs for the Ingress Controller service. | [] |
+|`controller.service.clusterIP` | The clusterIP for the Ingress Controller service, autoassigned if not specified. | "" |
 |`controller.service.loadBalancerSourceRanges` | The IP ranges (CIDR) that are allowed to access the load balancer. Requires `controller.service.type` set to `LoadBalancer`. The cloud provider must support this feature. | [] |
 |`controller.service.name` | The name of the service. | Autogenerated |
 |`controller.service.customPorts` | A list of custom ports to expose through the Ingress Controller service. Follows the conventional Kubernetes yaml syntax for service ports. | [] |

diff --git a/deployments/helm-chart/templates/controller-service.yaml b/deployments/helm-chart/templates/controller-service.yaml
@@ -14,6 +14,9 @@ metadata:
 {{ toYaml .Values.controller.service.annotations | indent 4 }}
 {{- end }}
 spec:
+{{- if .Values.controller.service.clusterIP }}
+  clusterIP: {{ .Values.controller.service.clusterIP }}
+{{- end }}
 {{- if or (eq .Values.controller.service.type "LoadBalancer") (eq .Values.controller.service.type "NodePort") }}
   {{- if .Values.controller.service.externalTrafficPolicy }}
   externalTrafficPolicy: {{ .Values.controller.service.externalTrafficPolicy }}

diff --git a/deployments/helm-chart/values.yaml b/deployments/helm-chart/values.yaml
@@ -301,6 +301,9 @@ controller:
     ## The static IP address for the load balancer. Requires controller.service.type set to LoadBalancer. The cloud provider must support this feature.
     loadBalancerIP: ""
 
+    ## The ClusterIP for the Ingress Controller service, autoassigned if not specified.
+    clusterIP: ""
+
     ## The list of external IPs for the Ingress Controller service.
     externalIPs: []