From 207e6f74b2a3655de89598ce93a1d985d21c76e5 Mon Sep 17 00:00:00 2001
From: Magnus Hyllander <magnus.hyllander@hivestreaming.com>
Date: Sun, 28 Jul 2019 14:29:55 +0200
Subject: [PATCH] [incubator/haproxy-ingress] haproxy-ingress v0.7.2 (#14519)

* Added imagePullSecrets

Signed-off-by: Magnus Hyllander <magnus.hyllander@hivestreaming.com>

* Update to haproxy-ingress v0.7.2

Signed-off-by: Magnus Hyllander <magnus.hyllander@hivestreaming.com>

* Force DCO check

Signed-off-by: David J. M. Karlsen <david@davidkarlsen.com>
---
 incubator/haproxy-ingress/Chart.yaml                         | 4 ++--
 incubator/haproxy-ingress/README.md                          | 3 ++-
 .../haproxy-ingress/templates/controller-daemonset.yaml      | 4 ++++
 .../haproxy-ingress/templates/controller-deployment.yaml     | 4 ++++
 incubator/haproxy-ingress/values.yaml                        | 5 ++++-
 5 files changed, 16 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 incubator/haproxy-ingress/README.md

diff --git a/incubator/haproxy-ingress/Chart.yaml b/incubator/haproxy-ingress/Chart.yaml
index 6b6bf945b1..2a3fb833e1 100644
--- a/incubator/haproxy-ingress/Chart.yaml
+++ b/incubator/haproxy-ingress/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: haproxy-ingress
-version: 0.0.14
-appVersion: 0.7.1
+version: 0.0.15
+appVersion: 0.7.2
 home: https://github.com/jcmoraisjr/haproxy-ingress
 description: Ingress controller implementation for haproxy loadbalancer.
 icon: http://www.haproxy.org/img/HAProxyCommunityEdition_60px.png
diff --git a/incubator/haproxy-ingress/README.md b/incubator/haproxy-ingress/README.md
old mode 100644
new mode 100755
index a107870f3a..0fce82a55e
--- a/incubator/haproxy-ingress/README.md
+++ b/incubator/haproxy-ingress/README.md
@@ -41,8 +41,9 @@ Parameter | Description | Default
 `serviceAccount.name` | ServiceAccount to be used | ``
 `controller.name` | name of the controller component | `controller`
 `controller.image.repository` | controller container image repository | `quay.io/jcmoraisjr/haproxy-ingress`
-`controller.image.tag` | controller container image tag | `v0.7.1`
+`controller.image.tag` | controller container image tag | `v0.7.2`
 `controller.image.pullPolicy` | controller container image pullPolicy | `IfNotPresent`
+`controller.imagePullSecrets` | controller image pull secrets | `[]`
 `controller.initContainers` | extra containers that can initialize the haproxy-ingress-controller | `[]`
 `controller.extraArgs` | extra command line arguments for the haproxy-ingress-controller | `{}`
 `controller.extraEnv` | extra environment variables for the haproxy-ingress-controller | `{}`
diff --git a/incubator/haproxy-ingress/templates/controller-daemonset.yaml b/incubator/haproxy-ingress/templates/controller-daemonset.yaml
index 4ece090838..3c6ca04179 100644
--- a/incubator/haproxy-ingress/templates/controller-daemonset.yaml
+++ b/incubator/haproxy-ingress/templates/controller-daemonset.yaml
@@ -166,6 +166,10 @@ spec:
           resources:
 {{ toYaml .Values.controller.metrics.resources | indent 12 }}
       {{- end }}
+{{- if .Values.controller.imagePullSecrets }}
+      imagePullSecrets:
+{{ toYaml .Values.controller.imagePullSecrets | indent 8 }}
+{{- end }}
 {{- if .Values.controller.template }}
       volumes:
         - name: haproxy-template
diff --git a/incubator/haproxy-ingress/templates/controller-deployment.yaml b/incubator/haproxy-ingress/templates/controller-deployment.yaml
index ce04175b01..5c0aed61bb 100644
--- a/incubator/haproxy-ingress/templates/controller-deployment.yaml
+++ b/incubator/haproxy-ingress/templates/controller-deployment.yaml
@@ -157,6 +157,10 @@ spec:
           resources:
 {{ toYaml .Values.controller.metrics.resources | indent 12 }}
       {{- end }}
+{{- if .Values.controller.imagePullSecrets }}
+      imagePullSecrets:
+{{ toYaml .Values.controller.imagePullSecrets | indent 8 }}
+{{- end }}
 {{- if .Values.controller.template }}
       volumes:
         - name: haproxy-template
diff --git a/incubator/haproxy-ingress/values.yaml b/incubator/haproxy-ingress/values.yaml
index 5f2d698e49..e128bb6509 100644
--- a/incubator/haproxy-ingress/values.yaml
+++ b/incubator/haproxy-ingress/values.yaml
@@ -16,9 +16,12 @@ controller:
   name: controller
   image:
     repository: quay.io/jcmoraisjr/haproxy-ingress
-    tag: "v0.7.1"
+    tag: "v0.7.2"
     pullPolicy: IfNotPresent
 
+  imagePullSecrets: []
+  # - name: secret-name
+
   ## Additional command line arguments to pass to haproxy-ingress-controller
   ## E.g. to specify the default SSL certificate you can use
   ## extraArgs: