From 9dd5c9858cb2d2122ccdac7a809eb375b3c5f140 Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Mon, 22 Oct 2018 13:47:40 -0500 Subject: [PATCH] [stable/redis] Avoid generating null annotations (#8588) Signed-off-by: Eric Bailey --- stable/redis/Chart.yaml | 2 +- stable/redis/templates/metrics-svc.yaml | 2 ++ stable/redis/templates/redis-slave-svc.yaml | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/stable/redis/Chart.yaml b/stable/redis/Chart.yaml index 9822d927f5..0547a9bcc9 100644 --- a/stable/redis/Chart.yaml +++ b/stable/redis/Chart.yaml @@ -1,5 +1,5 @@ name: redis -version: 4.2.1 +version: 4.2.2 appVersion: 4.0.11 description: Open source, advanced key-value store. It is often referred to as a data structure server since keys can contain strings, hashes, lists, sets and sorted sets. keywords: diff --git a/stable/redis/templates/metrics-svc.yaml b/stable/redis/templates/metrics-svc.yaml index 269f1fc60e..a2105152ca 100644 --- a/stable/redis/templates/metrics-svc.yaml +++ b/stable/redis/templates/metrics-svc.yaml @@ -8,8 +8,10 @@ metadata: chart: {{ template "redis.chart" . }} release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" +{{- if .Values.metrics.service.annotations }} annotations: {{ toYaml .Values.metrics.service.annotations | indent 4 }} +{{- end }} spec: type: {{ .Values.metrics.service.type }} {{ if eq .Values.metrics.service.type "LoadBalancer" -}} {{ if .Values.metrics.service.loadBalancerIP -}} diff --git a/stable/redis/templates/redis-slave-svc.yaml b/stable/redis/templates/redis-slave-svc.yaml index c2dd4fa340..f2de1b9b8d 100644 --- a/stable/redis/templates/redis-slave-svc.yaml +++ b/stable/redis/templates/redis-slave-svc.yaml @@ -8,8 +8,8 @@ metadata: chart: {{ template "redis.chart" . }} release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" - annotations: {{- if .Values.slave.service.annotations }} + annotations: {{ toYaml .Values.slave.service.annotations | indent 4 }} {{- end }} spec: