From f74e7b6d16c2de976da149cd504f1ee4e4bc2b60 Mon Sep 17 00:00:00 2001 From: Alan Tang Date: Wed, 4 Sep 2019 03:29:00 +0800 Subject: [PATCH] [stable/nginx-ingress] Add option to deploy both deployment and daemonset together (#16624) For #16604 Signed-off-by: Alan Tang --- stable/nginx-ingress/Chart.yaml | 2 +- stable/nginx-ingress/README.md | 2 +- stable/nginx-ingress/templates/controller-daemonset.yaml | 2 +- stable/nginx-ingress/templates/controller-deployment.yaml | 2 +- stable/nginx-ingress/templates/controller-hpa.yaml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/stable/nginx-ingress/Chart.yaml b/stable/nginx-ingress/Chart.yaml index 536a7076e9..3c79e2eff1 100644 --- a/stable/nginx-ingress/Chart.yaml +++ b/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. diff --git a/stable/nginx-ingress/README.md b/stable/nginx-ingress/README.md index def81d13d2..a7081bc1d9 100644 --- a/stable/nginx-ingress/README.md +++ b/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` diff --git a/stable/nginx-ingress/templates/controller-daemonset.yaml b/stable/nginx-ingress/templates/controller-daemonset.yaml index c2c05e2ce8..dfdf0b0b7a 100644 --- a/stable/nginx-ingress/templates/controller-daemonset.yaml +++ b/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 diff --git a/stable/nginx-ingress/templates/controller-deployment.yaml b/stable/nginx-ingress/templates/controller-deployment.yaml index 0acfe7dead..f9aad9ee86 100644 --- a/stable/nginx-ingress/templates/controller-deployment.yaml +++ b/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: diff --git a/stable/nginx-ingress/templates/controller-hpa.yaml b/stable/nginx-ingress/templates/controller-hpa.yaml index e027e808d5..f550dce41a 100644 --- a/stable/nginx-ingress/templates/controller-hpa.yaml +++ b/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