[stable/nginx-ingress] Add option to deploy both deployment and daemonset together (#16624)

For #16604

Signed-off-by: Alan Tang <alantang888@gmail.com>

stable/nginx-ingress/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
 name: nginx-ingress
-version: 1.17.1
+version: 1.18.0
 appVersion: 0.25.1
 home: https://github.com/kubernetes/ingress-nginx
 description: An nginx Ingress controller that uses ConfigMap to store the nginx configuration.

stable/nginx-ingress/README.md

@@ -68,7 +68,7 @@ Parameter | Description | Default
 `controller.scope.enabled` | limit the scope of the ingress controller | `false` (watch all namespaces)
 `controller.scope.namespace` | namespace to watch for ingress | `""` (use the release namespace)
 `controller.extraArgs` | Additional controller container arguments | `{}`
-`controller.kind` | install as Deployment or DaemonSet | `Deployment`
+`controller.kind` | install as Deployment, DaemonSet or Both | `Deployment`
 `controller.autoscaling.enabled` | If true, creates Horizontal Pod Autoscaler | false
 `controller.autoscaling.minReplicas` | If autoscaling enabled, this field sets minimum replica count | `2`
 `controller.autoscaling.maxReplicas` | If autoscaling enabled, this field sets maximum replica count | `11`

stable/nginx-ingress/templates/controller-daemonset.yaml

@@ -1,4 +1,4 @@
-{{- if eq .Values.controller.kind "DaemonSet" }}
+{{- if or (eq .Values.controller.kind "DaemonSet") (eq .Values.controller.kind "Both") }}
 {{- $useHostPort := .Values.controller.daemonset.useHostPort -}}
 apiVersion: extensions/v1beta1
 kind: DaemonSet

stable/nginx-ingress/templates/controller-deployment.yaml

@@ -1,4 +1,4 @@
-{{- if eq .Values.controller.kind "Deployment" }}
+{{- if or (eq .Values.controller.kind "Deployment") (eq .Values.controller.kind "Both") }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:

stable/nginx-ingress/templates/controller-hpa.yaml

@@ -1,4 +1,4 @@
-{{- if eq .Values.controller.kind "Deployment" }}
+{{- if or (eq .Values.controller.kind "Deployment") (eq .Values.controller.kind "Both") }}
 {{- if .Values.controller.autoscaling.enabled }}
 apiVersion: autoscaling/v2beta1
 kind: HorizontalPodAutoscaler