From f6310449469bc3eeff68c76f44129e88e2afbece Mon Sep 17 00:00:00 2001 From: Corey O'Brien Date: Sun, 8 Apr 2018 04:35:08 -0400 Subject: [PATCH] [stable/rabbitmq-ha] Add option to use existing certificate (#4114) * [stable/rabbit-ha] Add option to use existing certificate * [stable/rabbitmq-ha] Bump chart version * Fix typo * Bump minor version * [stable/rabbitmq-ha] Change secretName to existingSecret and only use it for existing secrets * Don't include cert Secret when rabbitmqCert.enabled=false * Bump chart version --- stable/rabbitmq-ha/Chart.yaml | 2 +- stable/rabbitmq-ha/README.md | 8 ++++++-- stable/rabbitmq-ha/templates/secret.yaml | 2 +- stable/rabbitmq-ha/templates/statefulset.yaml | 2 +- stable/rabbitmq-ha/values.yaml | 4 ++++ 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/stable/rabbitmq-ha/Chart.yaml b/stable/rabbitmq-ha/Chart.yaml index 0da25b86d5..b494e9d35d 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.3 -version: 1.1.0 +version: 1.2.0 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/README.md b/stable/rabbitmq-ha/README.md index 4a747a933b..eb583201fc 100644 --- a/stable/rabbitmq-ha/README.md +++ b/stable/rabbitmq-ha/README.md @@ -76,6 +76,11 @@ and their default values. | `persistentVolume.size` | Persistent volume size | `8Gi` | | `persistentVolume.storageClass` | Persistent volume storage class | `-` | | `podAntiAffinity` | Pod antiaffinity, `hard` or `soft` | `hard` | +| `rabbitmqCert.enabled` | Mount a Secret container certificates | `false` | +| `rabbitmqCert.existingSecret`     | Name of an existing `Secret` to mount for amqps               | ``                               | +| `rabbitmqCert.cacertfile` | base64 encoded CA certificate (overwrites existing Secret) | `` | +| `rabbitmqCert.certfile` | base64 encoded server certificate (overwrites existing Secret) | `` | +| `rabbitmqCert.keyfile` | base64 encoded server private key (overwrites existing Secret) | `` | | `rabbitmqEpmdPort` | EPMD port used for cross cluster replication | `4369` | | `rabbitmqErlangCookie` | Erlang cookie | _random 32 character long alphanumeric string_ | | `rabbitmqHipeCompile` | Precompile parts of RabbitMQ using HiPE | `false` | @@ -89,7 +94,7 @@ and their default values. | `rabbitmqSTOMPPlugin.enabled` | Enable STOMP plugin | `false` | | `rabbitmqUsername` | RabbitMQ application username | `guest` | | `rabbitmqVhost` | RabbitMQ application vhost | `/` | -| `rabbitmqWebMQTTPlugin.config` | MQTT over websocket configuration | `` | +| `rabbitmqWebMQTTPlugin.config`     | MQTT over websocket configuration                               | ``                                                       | | `rabbitmqWebMQTTPlugin.enabled` | Enable MQTT over websocket plugin | `false` | | `rabbitmqWebSTOMPPlugin.config` | STOMP over websocket configuration | `` | | `rabbitmqWebSTOMPPlugin.enabled` | Enable STOMP over websocket plugin | `false` | @@ -170,4 +175,3 @@ Then, install the chart with the above configuration: ``` $ helm install --name my-release --set customConfigMap=true stable/rabbitmq-ha ``` - diff --git a/stable/rabbitmq-ha/templates/secret.yaml b/stable/rabbitmq-ha/templates/secret.yaml index 4ebbcdc861..c1f9f72595 100644 --- a/stable/rabbitmq-ha/templates/secret.yaml +++ b/stable/rabbitmq-ha/templates/secret.yaml @@ -19,7 +19,7 @@ data: {{ else }} rabbitmq-erlang-cookie: {{ randAlphaNum 32 | b64enc | quote }} {{ end }} -{{- if .Values.rabbitmqCert.enabled }} +{{- if and .Values.rabbitmqCert.enabled (not .Values.rabbitmqCert.existingSecret) }} --- apiVersion: v1 kind: Secret diff --git a/stable/rabbitmq-ha/templates/statefulset.yaml b/stable/rabbitmq-ha/templates/statefulset.yaml index b43f6a221a..d96f60a87f 100644 --- a/stable/rabbitmq-ha/templates/statefulset.yaml +++ b/stable/rabbitmq-ha/templates/statefulset.yaml @@ -176,7 +176,7 @@ spec: - name: cert secret: defaultMode: 420 - secretName: {{ template "rabbitmq-ha.fullname" . }}-cert + secretName: {{ .Values.rabbitmqCert.existingSecret | default (printf "%s-cert" (include "rabbitmq-ha.fullname" . )) }} {{- end }} {{- if .Values.persistentVolume.enabled }} volumeClaimTemplates: diff --git a/stable/rabbitmq-ha/values.yaml b/stable/rabbitmq-ha/values.yaml index e7c147847d..554ea4f02b 100644 --- a/stable/rabbitmq-ha/values.yaml +++ b/stable/rabbitmq-ha/values.yaml @@ -41,6 +41,10 @@ rabbitmqHipeCompile: false rabbitmqCert: enabled: false + ## Specify an existing secret to use + existingSecret: | + + ## Create a new secret using these values cacertfile: | certfile: | keyfile: |