From 65046e3ceed4cec34eb2b4fd35c363c087515f28 Mon Sep 17 00:00:00 2001 From: Enrico Stahn Date: Fri, 4 May 2018 04:19:51 +1000 Subject: [PATCH] fix(stable/rabbitmq-ha): Enabling TLS for ingress resulted in YAML parse error (#4835) (#4836) * fix(stable/rabbitmq-ha): Enabling TLS for ingress resulted in YAML parse error (#4835) * fix(stable/rabbitmq-ha): Increment the new chart version to be greater than the existing version of * fix(stable/rabbitmq-ha): Use rabbitmqManagerPort for ingress --- stable/rabbitmq-ha/Chart.yaml | 2 +- stable/rabbitmq-ha/templates/ingress.yaml | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/stable/rabbitmq-ha/Chart.yaml b/stable/rabbitmq-ha/Chart.yaml index 2782553798..370514dab6 100644 --- a/stable/rabbitmq-ha/Chart.yaml +++ b/stable/rabbitmq-ha/Chart.yaml @@ -1,7 +1,7 @@ name: rabbitmq-ha apiVersion: v1 appVersion: 3.7.4 -version: 1.3.3 +version: 1.3.4 description: Highly available RabbitMQ cluster, the open source message broker software that implements the Advanced Message Queuing Protocol (AMQP). keywords: diff --git a/stable/rabbitmq-ha/templates/ingress.yaml b/stable/rabbitmq-ha/templates/ingress.yaml index b67f0b28e9..f9d6831145 100644 --- a/stable/rabbitmq-ha/templates/ingress.yaml +++ b/stable/rabbitmq-ha/templates/ingress.yaml @@ -24,15 +24,13 @@ spec: - path: {{ .Values.ingress.path }} backend: serviceName: {{ template "rabbitmq-ha.fullname" . }} - servicePort: http + servicePort: {{ .Values.rabbitmqManagerPort }} {{- if .Values.ingress.tls }} tls: - - hosts: - {{- if .Values.ingress.hostName }} + - secretName: {{ .Values.ingress.tlsSecret }} + {{- if .Values.ingress.hostName }} + hosts: - {{ .Values.ingress.hostName }} - secretName: {{ .Values.ingress.tlsSecret }} - {{- else}} - - secretName: {{ .Values.ingress.tlsSecret }} - {{- end }} + {{- end }} {{- end }} {{- end }}