From 16398d97c16fa13e738f39400f9ed950b13b2a72 Mon Sep 17 00:00:00 2001 From: Michael Frayer Date: Mon, 16 Sep 2019 15:18:38 -0400 Subject: [PATCH] [stable/redis-ha] Correcting the number of arguments to toYaml (#16870) * [stable/redis-ha] Correcting the number of arguments to toYaml from 2 to 1 Signed-off-by: Michael Frayer * Adding haproxy annotation to the CI test case This will aid in testing for any template errors when applying annotations on the "haproxy" Deployment. Signed-off-by: Michael Frayer * [stable/redis-ha] Bumping Chart patch version Signed-off-by: Michael Frayer * [stable/redis-ha] Bumping PATCH version Signed-off-by: Michael Frayer --- stable/redis-ha/Chart.yaml | 2 +- stable/redis-ha/ci/haproxy-enabled-values.yaml | 2 ++ stable/redis-ha/templates/redis-haproxy-deployment.yaml | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/stable/redis-ha/Chart.yaml b/stable/redis-ha/Chart.yaml index e4735e420b..331e6b4025 100644 --- a/stable/redis-ha/Chart.yaml +++ b/stable/redis-ha/Chart.yaml @@ -6,7 +6,7 @@ keywords: - redis - keyvalue - database -version: 3.7.7 +version: 3.7.8 appVersion: 5.0.5 description: Highly available Kubernetes implementation of Redis icon: https://upload.wikimedia.org/wikipedia/en/thumb/6/6b/Redis_Logo.svg/1200px-Redis_Logo.svg.png diff --git a/stable/redis-ha/ci/haproxy-enabled-values.yaml b/stable/redis-ha/ci/haproxy-enabled-values.yaml index f0a487c4d1..21e9152cba 100644 --- a/stable/redis-ha/ci/haproxy-enabled-values.yaml +++ b/stable/redis-ha/ci/haproxy-enabled-values.yaml @@ -2,6 +2,8 @@ ## Enable HAProxy to manage Load Balancing haproxy: enabled: true + annotations: + any.domain/key: "value" serviceAccount: create: true exporter: diff --git a/stable/redis-ha/templates/redis-haproxy-deployment.yaml b/stable/redis-ha/templates/redis-haproxy-deployment.yaml index e071229358..81b0549467 100644 --- a/stable/redis-ha/templates/redis-haproxy-deployment.yaml +++ b/stable/redis-ha/templates/redis-haproxy-deployment.yaml @@ -26,7 +26,7 @@ spec: prometheus.io/scrape: "true" checksum/config: {{ include (print $.Template.BasePath "/redis-ha-configmap.yaml") . | sha256sum }} {{- if .Values.haproxy.annotations }} -{{ toYaml .Values.haproxy.annotations . | indent 8 }} +{{ toYaml .Values.haproxy.annotations | indent 8 }} {{- end }} spec: # Needed when using unmodified rbac-setup.yml