From 28993e1abbdf1d9f17e75cbcf4447e53607a4b09 Mon Sep 17 00:00:00 2001 From: Babis K Date: Thu, 27 Feb 2020 12:21:20 +0200 Subject: [PATCH] Changed RabbitMQ TLS secret type to kubernetes.io/tls. Can use cert-manager created secrets with this chart now. (#20907) Signed-off-by: Charalampos Kaidos --- stable/rabbitmq/Chart.yaml | 2 +- stable/rabbitmq/README.md | 2 +- stable/rabbitmq/templates/certs.yaml | 8 ++++---- stable/rabbitmq/templates/statefulset.yaml | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/stable/rabbitmq/Chart.yaml b/stable/rabbitmq/Chart.yaml index 1ca338895e..255cf7fb41 100644 --- a/stable/rabbitmq/Chart.yaml +++ b/stable/rabbitmq/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: rabbitmq -version: 6.18.0 +version: 6.18.1 appVersion: 3.8.2 description: Open source message broker software that implements the Advanced Message Queuing Protocol (AMQP) keywords: diff --git a/stable/rabbitmq/README.md b/stable/rabbitmq/README.md index c370e98e49..d519fbe013 100644 --- a/stable/rabbitmq/README.md +++ b/stable/rabbitmq/README.md @@ -342,7 +342,7 @@ You must include in your values.yaml the caCertificate, serverCertificate and se -----END RSA PRIVATE KEY----- ``` -This will be generate a secret with the certs, but is possible specify an existing secret using `existingSecret: name-of-existing-secret-to-rabbitmq` +This will be generate a secret with the certs, but is possible specify an existing secret using `existingSecret: name-of-existing-secret-to-rabbitmq`. The secret is of type `kubernetes.io/tls`. Disabling [failIfNoPeerCert](https://www.rabbitmq.com/ssl.html#peer-verification-configuration) allows a TLS connection if client fails to provide a certificate diff --git a/stable/rabbitmq/templates/certs.yaml b/stable/rabbitmq/templates/certs.yaml index 33821522b0..1aa999be04 100644 --- a/stable/rabbitmq/templates/certs.yaml +++ b/stable/rabbitmq/templates/certs.yaml @@ -8,12 +8,12 @@ metadata: chart: {{ template "rabbitmq.chart" . }} release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" -type: Opaque +type: kubernetes.io/tls data: - ca_certificate.pem: + ca.crt: {{ required "A valid .Values.rabbitmq.tls.caCertificate entry required!" .Values.rabbitmq.tls.caCertificate | b64enc | quote }} - server_certificate.pem: + tls.crt: {{ required "A valid .Values.rabbitmq.tls.serverCertificate entry required!" .Values.rabbitmq.tls.serverCertificate| b64enc | quote }} - server_key.pem: + tls.key: {{ required "A valid .Values.rabbitmq.tls.serverKey entry required!" .Values.rabbitmq.tls.serverKey | b64enc | quote }} {{- end }} diff --git a/stable/rabbitmq/templates/statefulset.yaml b/stable/rabbitmq/templates/statefulset.yaml index 5b652fef3e..08d4364bca 100644 --- a/stable/rabbitmq/templates/statefulset.yaml +++ b/stable/rabbitmq/templates/statefulset.yaml @@ -311,11 +311,11 @@ spec: secret: secretName: {{ if .Values.rabbitmq.tls.existingSecret }}{{ .Values.rabbitmq.tls.existingSecret }}{{- else }}{{ template "rabbitmq.fullname" . }}-certs{{- end }} items: - - key: ca_certificate.pem + - key: ca.crt path: ca_certificate.pem - - key: server_certificate.pem + - key: tls.crt path: server_certificate.pem - - key: server_key.pem + - key: tls.key path: server_key.pem {{- end }} - name: config-volume