diff --git a/stable/nginx-ingress/Chart.yaml b/stable/nginx-ingress/Chart.yaml index 3e67b8ef8ee3..6cf35c292f3a 100644 --- a/stable/nginx-ingress/Chart.yaml +++ b/stable/nginx-ingress/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: nginx-ingress -version: 1.29.6 +version: 1.29.7 appVersion: 0.28.0 home: https://github.com/kubernetes/ingress-nginx description: An nginx Ingress controller that uses ConfigMap to store the nginx configuration. diff --git a/stable/nginx-ingress/README.md b/stable/nginx-ingress/README.md index 87351c8aeae7..e6e99e4f7696 100644 --- a/stable/nginx-ingress/README.md +++ b/stable/nginx-ingress/README.md @@ -98,7 +98,7 @@ Parameter | Description | Default `controller.publishService.enabled` | if true, the controller will set the endpoint records on the ingress objects to reflect those on the service | `false` `controller.publishService.pathOverride` | override of the default publish-service name | `""` `controller.service.enabled` | if disabled no service will be created. This is especially useful when `controller.kind` is set to `DaemonSet` and `controller.daemonset.useHostPorts` is `true` | true -`controller.service.clusterIP` | internal controller cluster service IP | `nil` +`controller.service.clusterIP` | internal controller cluster service IP (set to `"-"` to pass an empty value) | `nil` `controller.service.omitClusterIP` | (Deprecated) To omit the `clusterIP` from the controller service | `false` `controller.service.externalIPs` | controller service external IP addresses. Do not set this when `controller.hostNetwork` is set to `true` and `kube-proxy` is used as there will be a port-conflict for port `80` | `[]` `controller.service.externalTrafficPolicy` | If `controller.service.type` is `NodePort` or `LoadBalancer`, set this to `Local` to enable [source IP preservation](https://kubernetes.io/docs/tutorials/services/source-ip/#source-ip-for-services-with-typenodeport) | `"Cluster"` @@ -130,7 +130,7 @@ Parameter | Description | Default `controller.readinessProbe.port` | The port number that the readiness probe will listen on. | 10254 `controller.metrics.enabled` | if `true`, enable Prometheus metrics | `false` `controller.metrics.service.annotations` | annotations for Prometheus metrics service | `{}` -`controller.metrics.service.clusterIP` | cluster IP address to assign to service | `nil` +`controller.metrics.service.clusterIP` | cluster IP address to assign to service (set to `"-"` to pass an empty value) | `nil` `controller.metrics.service.omitClusterIP` | (Deprecated) To omit the `clusterIP` from the metrics service | `false` `controller.metrics.service.externalIPs` | Prometheus metrics service external IP addresses | `[]` `controller.metrics.service.labels` | labels for metrics service | `{}` @@ -153,7 +153,7 @@ Parameter | Description | Default `controller.admissionWebhooks.port` | Admission webhook port | `8080` `controller.admissionWebhooks.service.annotations` | Annotations for admission webhook service | `{}` `controller.admissionWebhooks.service.omitClusterIP` | (Deprecated) To omit the `clusterIP` from the admission webhook service | `false` -`controller.admissionWebhooks.service.clusterIP` | cluster IP address to assign to admission webhook service | `nil` +`controller.admissionWebhooks.service.clusterIP` | cluster IP address to assign to admission webhook service (set to `"-"` to pass an empty value) | `nil` `controller.admissionWebhooks.service.externalIPs` | Admission webhook service external IP addresses | `[]` `controller.admissionWebhooks.service.loadBalancerIP` | IP address to assign to load balancer (if supported) | `""` `controller.admissionWebhooks.service.loadBalancerSourceRanges` | List of IP CIDRs allowed access to load balancer (if supported) | `[]` @@ -205,7 +205,7 @@ Parameter | Description | Default `defaultBackend.priorityClassName` | default backend priorityClassName | `nil` `defaultBackend.podSecurityContext` | Security context policies to add to the default backend | `{}` `defaultBackend.service.annotations` | annotations for default backend service | `{}` -`defaultBackend.service.clusterIP` | internal default backend cluster service IP | `nil` +`defaultBackend.service.clusterIP` | internal default backend cluster service IP (set to `"-"` to pass an empty value) | `nil` `defaultBackend.service.omitClusterIP` | (Deprecated) To omit the `clusterIP` from the default backend service | `false` `defaultBackend.service.externalIPs` | default backend service external IP addresses | `[]` `defaultBackend.service.loadBalancerIP` | IP address to assign to load balancer (if supported) | `""` diff --git a/stable/nginx-ingress/templates/controller-metrics-service.yaml b/stable/nginx-ingress/templates/controller-metrics-service.yaml index 98d2046c1d8f..f38dca01da96 100644 --- a/stable/nginx-ingress/templates/controller-metrics-service.yaml +++ b/stable/nginx-ingress/templates/controller-metrics-service.yaml @@ -20,7 +20,9 @@ metadata: name: {{ template "nginx-ingress.controller.fullname" . }}-metrics spec: {{- if not .Values.controller.metrics.service.omitClusterIP }} - {{ with .Values.controller.metrics.service.clusterIP }}clusterIP: {{ . | quote }}{{ end }} + {{- with .Values.controller.metrics.service.clusterIP }} + clusterIP: {{ if eq "-" . }}""{{ else }}{{ . | quote }}{{ end }} + {{- end }} {{- end }} {{- if .Values.controller.metrics.service.externalIPs }} externalIPs: diff --git a/stable/nginx-ingress/templates/controller-service.yaml b/stable/nginx-ingress/templates/controller-service.yaml index 54608baf1e34..2cd248972ad7 100644 --- a/stable/nginx-ingress/templates/controller-service.yaml +++ b/stable/nginx-ingress/templates/controller-service.yaml @@ -20,7 +20,9 @@ metadata: name: {{ template "nginx-ingress.controller.fullname" . }} spec: {{- if not .Values.controller.service.omitClusterIP }} - {{ with .Values.controller.service.clusterIP }}clusterIP: {{ . | quote }}{{ end }} + {{- with .Values.controller.service.clusterIP }} + clusterIP: {{ if eq "-" . }}""{{ else }}{{ . | quote }}{{ end }} + {{- end }} {{- end }} {{- if .Values.controller.service.externalIPs }} externalIPs: diff --git a/stable/nginx-ingress/templates/controller-webhook-service.yaml b/stable/nginx-ingress/templates/controller-webhook-service.yaml index 6c6d0cfed22e..0b2a4ca79c9e 100644 --- a/stable/nginx-ingress/templates/controller-webhook-service.yaml +++ b/stable/nginx-ingress/templates/controller-webhook-service.yaml @@ -17,7 +17,9 @@ metadata: name: {{ template "nginx-ingress.controller.fullname" . }}-admission spec: {{- if not .Values.controller.admissionWebhooks.service.omitClusterIP }} - {{ with .Values.controller.admissionWebhooks.service.clusterIP }}clusterIP: {{ . | quote }}{{ end }} + {{- with .Values.controller.admissionWebhooks.service.clusterIP }} + clusterIP: {{ if eq "-" . }}""{{ else }}{{ . | quote }}{{ end }} + {{- end }} {{- end }} {{- if .Values.controller.admissionWebhooks.service.externalIPs }} externalIPs: diff --git a/stable/nginx-ingress/templates/default-backend-service.yaml b/stable/nginx-ingress/templates/default-backend-service.yaml index 9f47c6fcdcce..c7d336eeaf32 100644 --- a/stable/nginx-ingress/templates/default-backend-service.yaml +++ b/stable/nginx-ingress/templates/default-backend-service.yaml @@ -17,7 +17,9 @@ metadata: name: {{ template "nginx-ingress.defaultBackend.fullname" . }} spec: {{- if not .Values.defaultBackend.service.omitClusterIP }} - {{ with .Values.defaultBackend.service.clusterIP }}clusterIP: {{ . | quote }}{{ end }} + {{- with .Values.defaultBackend.service.clusterIP }} + clusterIP: {{ if eq "-" . }}""{{ else }}{{ . | quote }}{{ end }} + {{- end }} {{- end }} {{- if .Values.defaultBackend.service.externalIPs }} externalIPs: