From 45f36f1cecdedfad4f613007b538f1dfd346b66a Mon Sep 17 00:00:00 2001 From: bitnami-bot Date: Thu, 14 Mar 2019 06:37:31 +0000 Subject: [PATCH] Synchronize upstreamed folder to 8b5d06ff4 --- upstreamed/joomla/Chart.yaml | 4 +-- upstreamed/joomla/values.yaml | 2 +- upstreamed/rabbitmq/Chart.yaml | 2 +- upstreamed/rabbitmq/README.md | 26 +++++++++++++++++++ .../rabbitmq/templates/configuration.yaml | 1 - .../rabbitmq/templates/statefulset.yaml | 10 +++++++ upstreamed/rabbitmq/values-production.yaml | 5 ++++ upstreamed/rabbitmq/values.yaml | 5 ++++ upstreamed/wordpress/Chart.yaml | 4 +-- upstreamed/wordpress/values-production.yaml | 2 +- upstreamed/wordpress/values.yaml | 2 +- 11 files changed, 54 insertions(+), 9 deletions(-) diff --git a/upstreamed/joomla/Chart.yaml b/upstreamed/joomla/Chart.yaml index b54dacd37b..b3d192cda3 100644 --- a/upstreamed/joomla/Chart.yaml +++ b/upstreamed/joomla/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: joomla -version: 4.1.0 -appVersion: 3.9.3 +version: 4.1.1 +appVersion: 3.9.4 description: PHP content management system (CMS) for publishing web content keywords: - joomla diff --git a/upstreamed/joomla/values.yaml b/upstreamed/joomla/values.yaml index 54cbc7cb01..ea9ba95a27 100644 --- a/upstreamed/joomla/values.yaml +++ b/upstreamed/joomla/values.yaml @@ -13,7 +13,7 @@ image: registry: docker.io repository: bitnami/joomla - tag: 3.9.3 + tag: 3.9.4 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images diff --git a/upstreamed/rabbitmq/Chart.yaml b/upstreamed/rabbitmq/Chart.yaml index 43fba54673..f454347e96 100644 --- a/upstreamed/rabbitmq/Chart.yaml +++ b/upstreamed/rabbitmq/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: rabbitmq -version: 4.5.0 +version: 4.6.0 appVersion: 3.7.13 description: Open source message broker software that implements the Advanced Message Queuing Protocol (AMQP) keywords: diff --git a/upstreamed/rabbitmq/README.md b/upstreamed/rabbitmq/README.md index 437561f995..ed5fdd886c 100644 --- a/upstreamed/rabbitmq/README.md +++ b/upstreamed/rabbitmq/README.md @@ -130,6 +130,32 @@ $ helm install --name my-release -f values.yaml stable/rabbitmq > **Tip**: You can use the default [values.yaml](values.yaml) +### Load Definitions +It is possible to [load a RabbitMQ definitions file to configure RabbitMQ](http://www.rabbitmq.com/management.html#load-definitions). Because definitions may contain RabbitMQ credentials, [store the JSON as a Kubernetes secret](https://kubernetes.io/docs/concepts/configuration/secret/#using-secrets-as-files-from-a-pod). Within the secret's data, choose a key name that corresponds with the desired load definitions filename (i.e. `load_definition.json`) and use the JSON object as the value. For example: + +```yaml +apiVersion: v1 +kind: Secret +metadata: + name: rabbitmq-load-definition +type: Opaque +stringData: + load_definition.json: |- + { + "vhosts": [ + { + "name": "/" + } + ] + } +``` + +Then, specify the `management.load_definitions` property as an `extraConfiguration` pointing to the load definition file path within the container (i.e. `/app/load_definition.json`) and set `loadDefinition.enable` to `true`. + +Any load definitions specified will be available within in the container at `/app`. + +> Loading a definition will take precedence over any configuration done through [Helm values](#configuration). + ## Production configuration A standard configuration is provided by default that will run on most development environments. To operate this chart in a production environment, we recommend you use the alternative file values-production.yaml provided in this repository. diff --git a/upstreamed/rabbitmq/templates/configuration.yaml b/upstreamed/rabbitmq/templates/configuration.yaml index 24ded9399e..afc268a4d1 100644 --- a/upstreamed/rabbitmq/templates/configuration.yaml +++ b/upstreamed/rabbitmq/templates/configuration.yaml @@ -16,4 +16,3 @@ data: default_pass=CHANGEME {{ .Values.rabbitmq.configuration | indent 4 }} {{ .Values.rabbitmq.extraConfiguration | indent 4 }} - diff --git a/upstreamed/rabbitmq/templates/statefulset.yaml b/upstreamed/rabbitmq/templates/statefulset.yaml index 2cf8870149..042fc68a0d 100644 --- a/upstreamed/rabbitmq/templates/statefulset.yaml +++ b/upstreamed/rabbitmq/templates/statefulset.yaml @@ -82,6 +82,11 @@ spec: mountPath: /opt/bitnami/rabbitmq/conf - name: data mountPath: /opt/bitnami/rabbitmq/var/lib/rabbitmq/ + {{- if .Values.rabbitmq.loadDefinition.enabled }} + - name: load-definition-volume + mountPath: /app + readOnly: true + {{- end }} ports: - name: epmd containerPort: 4369 @@ -204,6 +209,11 @@ spec: path: rabbitmq.conf - key: enabled_plugins path: enabled_plugins + {{- if .Values.rabbitmq.loadDefinition.enabled }} + - name: load-definition-volume + secret: + secretName: {{ .Values.rabbitmq.loadDefinition.secretName | quote }} + {{- end }} {{- if not .Values.persistence.enabled }} - name: data emptyDir: {} diff --git a/upstreamed/rabbitmq/values-production.yaml b/upstreamed/rabbitmq/values-production.yaml index b925f31d98..88c98c3c38 100644 --- a/upstreamed/rabbitmq/values-production.yaml +++ b/upstreamed/rabbitmq/values-production.yaml @@ -74,6 +74,10 @@ rabbitmq: address_type: ip k8s_domain: cluster.local + loadDefinition: + enabled: false + secretName: load-definition + ## Configuration file content: required cluster configuration ## Do not override unless you know what you are doing. To add more configuration, use `extraConfiguration` instead configuration: |- @@ -92,6 +96,7 @@ rabbitmq: ## Use this instead of `configuration` to add more configuration extraConfiguration: |- #disk_free_limit.absolute = 50MB + #management.load_definitions = /app/load_definition.json ## Kubernetes service type service: diff --git a/upstreamed/rabbitmq/values.yaml b/upstreamed/rabbitmq/values.yaml index 1b993575ed..da0b6bd46d 100644 --- a/upstreamed/rabbitmq/values.yaml +++ b/upstreamed/rabbitmq/values.yaml @@ -74,6 +74,10 @@ rabbitmq: address_type: ip k8s_domain: cluster.local + loadDefinition: + enabled: false + secretName: load-definition + ## Configuration file content: required cluster configuration ## Do not override unless you know what you are doing. To add more configuration, use `extraConfiguration` instead configuration: |- @@ -92,6 +96,7 @@ rabbitmq: ## Use this instead of `configuration` to add more configuration extraConfiguration: |- #disk_free_limit.absolute = 50MB + #management.load_definitions = /app/load_definition.json ## Kubernetes service type service: diff --git a/upstreamed/wordpress/Chart.yaml b/upstreamed/wordpress/Chart.yaml index ad09af172b..13d771f0a3 100644 --- a/upstreamed/wordpress/Chart.yaml +++ b/upstreamed/wordpress/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: wordpress -version: 5.6.0 -appVersion: 5.1.0 +version: 5.6.1 +appVersion: 5.1.1 description: Web publishing platform for building blogs and websites. icon: https://bitnami.com/assets/stacks/wordpress/img/wordpress-stack-220x234.png keywords: diff --git a/upstreamed/wordpress/values-production.yaml b/upstreamed/wordpress/values-production.yaml index 7876ab71c9..6d056e8eab 100644 --- a/upstreamed/wordpress/values-production.yaml +++ b/upstreamed/wordpress/values-production.yaml @@ -13,7 +13,7 @@ image: registry: docker.io repository: bitnami/wordpress - tag: 5.1.0 + tag: 5.1.1 pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets. ## Secrets must be manually created in the namespace. diff --git a/upstreamed/wordpress/values.yaml b/upstreamed/wordpress/values.yaml index cf4c6c1acc..d67ada93e7 100644 --- a/upstreamed/wordpress/values.yaml +++ b/upstreamed/wordpress/values.yaml @@ -13,7 +13,7 @@ image: registry: docker.io repository: bitnami/wordpress - tag: 5.1.0 + tag: 5.1.1 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images