[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
This commit is contained in:
Corey O'Brien
2018-04-08 01:35:08 -07:00
committed by k8s-ci-robot
parent 276f446055
commit f631044946
5 changed files with 13 additions and 5 deletions
+1 -1
View File
@@ -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:
+6 -2
View File
@@ -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
```
+1 -1
View File
@@ -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
@@ -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:
+4
View File
@@ -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: |