Fix helm#10921 (helm#16936)

* Fix helm#10921 When the controller kind is specified as DaemonSet and useHostPort is set to true, there is no need to spin up a service of type NodePort or LoadBalancer, or at least you should be able to disable this option. Signed-off-by: Markus Schlotbohm <[email protected]> * Add option `controller.service.enabled` to disable deployment of the service template. Signed-off-by: Markus Schlotbohm <[email protected]>
marensofier · Sep 6, 2019 · d68ff3e · d68ff3e
1 parent 8898055
commit d68ff3e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 1 deletion.
diff --git a/stable/nginx-ingress/Chart.yaml b/stable/nginx-ingress/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: nginx-ingress
-version: 1.19.0
+version: 1.19.1
 appVersion: 0.25.1
 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
@@ -94,6 +94,7 @@ Parameter | Description | Default
 `controller.service.labels` | labels for controller service | `{}`
 `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 | `""`
 `controller.service.omitClusterIP` | 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` | `[]`

diff --git a/stable/nginx-ingress/templates/controller-service.yaml b/stable/nginx-ingress/templates/controller-service.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.controller.service.enabled }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -85,3 +86,4 @@ spec:
     component: "{{ .Values.controller.name }}"
     release: {{ .Release.Name }}
   type: "{{ .Values.controller.service.type }}"
+{{- end }}
diff --git a/stable/nginx-ingress/values.yaml b/stable/nginx-ingress/values.yaml
@@ -222,6 +222,8 @@ controller:
     configMapKey: ""
 
   service:
+    enabled: true
+
     annotations: {}
     labels: {}
     omitClusterIP: false