Closes #14209 - Separate TLS certificate/key secret and CA configuration (#14233)

Signed-off-by: Marin Stavrev <mstavrev@gmail.com>
This commit is contained in:
mstavrev
2023-01-12 13:48:49 +01:00
committed by GitHub
parent a9d5914e23
commit 55d5a72569
4 changed files with 24 additions and 10 deletions
+1 -1
View File
@@ -24,4 +24,4 @@ name: rabbitmq
sources:
- https://github.com/bitnami/containers/tree/main/bitnami/rabbitmq
- https://www.rabbitmq.com
version: 11.3.2
version: 11.4.0
+1
View File
@@ -108,6 +108,7 @@ The command removes all the Kubernetes components associated with the chart and
| `auth.tls.serverKey` | Server private key content | `""` |
| `auth.tls.existingSecret` | Existing secret with certificate content to RabbitMQ credentials | `""` |
| `auth.tls.existingSecretFullChain` | Whether or not the existing secret contains the full chain in the certificate (`tls.crt`). Will be used in place of `ca.cert` if `true`. | `false` |
| `auth.tls.overrideCaCertificate` | Existing secret with certificate content be mounted instead of the `ca.crt` coming from caCertificate or existingSecret/existingSecretFullChain. | `""` |
| `logs` | Path of the RabbitMQ server's Erlang log file. Value for the `RABBITMQ_LOGS` environment variable | `-` |
| `ulimitNofiles` | RabbitMQ Max File Descriptors | `65536` |
| `maxAvailableSchedulers` | RabbitMQ maximum available scheduler threads | `""` |
+20 -9
View File
@@ -344,15 +344,26 @@ spec:
volumes:
{{- if .Values.auth.tls.enabled }}
- name: certs
secret:
secretName: {{ template "rabbitmq.tlsSecretName" . }}
items:
- key: {{ ternary "tls.crt" "ca.crt" .Values.auth.tls.existingSecretFullChain }}
path: ca_certificate.pem
- key: tls.crt
path: server_certificate.pem
- key: tls.key
path: server_key.pem
projected:
sources:
- secret:
name: {{ template "rabbitmq.tlsSecretName" . }}
items:
{{- if not .Values.auth.tls.overrideCaCertificate }}
- key: {{ ternary "tls.crt" "ca.crt" .Values.auth.tls.existingSecretFullChain }}
path: ca_certificate.pem
{{- end }}
- key: tls.crt
path: server_certificate.pem
- key: tls.key
path: server_key.pem
{{- if .Values.auth.tls.overrideCaCertificate }}
- secret:
name: {{ .Values.auth.tls.overrideCaCertificate }}
items:
- key: ca.crt
path: ca_certificate.pem
{{- end }}
{{- end }}
{{- if and .Values.ldap.tls.enabled .Values.ldap.tls.certificatesSecret }}
- name: ldap-certs
+2
View File
@@ -156,6 +156,7 @@ auth:
## @param auth.tls.serverKey Server private key content
## @param auth.tls.existingSecret Existing secret with certificate content to RabbitMQ credentials
## @param auth.tls.existingSecretFullChain Whether or not the existing secret contains the full chain in the certificate (`tls.crt`). Will be used in place of `ca.cert` if `true`.
## @param auth.tls.overrideCaCertificate Existing secret with certificate content be mounted instead of the `ca.crt` coming from caCertificate or existingSecret/existingSecretFullChain.
##
tls:
enabled: false
@@ -167,6 +168,7 @@ auth:
serverKey: |-
existingSecret: ""
existingSecretFullChain: false
overrideCaCertificate: ""
## @param logs Path of the RabbitMQ server's Erlang log file. Value for the `RABBITMQ_LOGS` environment variable
## ref: https://www.rabbitmq.com/logging.html#log-file-location