From f4738a589b1b6fe3cef7ad89774add079fe66fef Mon Sep 17 00:00:00 2001 From: Emanuele Piccinelli Date: Wed, 19 Jun 2019 17:05:51 +0200 Subject: [PATCH] docker image DISABLE_SECURITY env variable as helm variable --- README.md | 1 + activemq-artemis/Chart.yaml | 2 +- activemq-artemis/templates/master-statefulset.yaml | 5 +++++ activemq-artemis/templates/slave-statefulset.yaml | 5 +++++ activemq-artemis/values.yaml | 3 +++ 5 files changed, 15 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 8a9c651..a6e8e50 100644 --- a/README.md +++ b/README.md @@ -88,6 +88,7 @@ The following tables lists the configurable parameters of the MySQL chart and th | `persistence.testJournalPerformance` | See docker image docs | `AUTO` | | `resources.request.memory` | Memory resource requests/limits | `256Mi` | | `resources.request.cpu` | CPU/Memory resource requests/limits | `100m` | +| `disableSecurity` | Disables activeMQ security features | `false` | Some of the parameters above map to the env variables defined in the [vromero's ActiveMQ Artemis image](https://hub.docker.com/r/vromero/activemq-artemis/) refer to it for values, meaning, etc. diff --git a/activemq-artemis/Chart.yaml b/activemq-artemis/Chart.yaml index c3c3af9..a4db3ba 100644 --- a/activemq-artemis/Chart.yaml +++ b/activemq-artemis/Chart.yaml @@ -1,5 +1,5 @@ name: activemq-artemis -version: 0.0.1 +version: 0.1.1 appVersion: 2.6.2 description: a multi-protocol, embeddable, very high performance, clustered, asynchronous messaging system. keywords: diff --git a/activemq-artemis/templates/master-statefulset.yaml b/activemq-artemis/templates/master-statefulset.yaml index 14db001..1040929 100644 --- a/activemq-artemis/templates/master-statefulset.yaml +++ b/activemq-artemis/templates/master-statefulset.yaml @@ -68,6 +68,10 @@ spec: resources: {{ toYaml .Values.resources | indent 10 }} env: +{{- if .Values.disableSecurity }} + - name: DISABLE_SECURITY + value: "true" +{{- else }} - name: ARTEMIS_PASSWORD valueFrom: secretKeyRef: @@ -75,6 +79,7 @@ spec: key: artemis-password - name: ARTEMIS_USERNAME value: {{ default "artemis" .Values.artemisUser | quote }} +{{- end }} - name: ARTEMIS_PERF_JOURNAL value: {{ default "AUTO" .Values.persistence.testJournalPerformance | quote }} - name: ENABLE_JMX_EXPORTER diff --git a/activemq-artemis/templates/slave-statefulset.yaml b/activemq-artemis/templates/slave-statefulset.yaml index d6af3b6..d6e422e 100644 --- a/activemq-artemis/templates/slave-statefulset.yaml +++ b/activemq-artemis/templates/slave-statefulset.yaml @@ -48,6 +48,10 @@ spec: resources: {{ toYaml .Values.resources | indent 10 }} env: +{{- if .Values.disableSecurity }} + - name: DISABLE_SECURITY + value: "true" +{{- else }} - name: ARTEMIS_PASSWORD valueFrom: secretKeyRef: @@ -55,6 +59,7 @@ spec: key: artemis-password - name: ARTEMIS_USERNAME value: {{ default "artemis" .Values.artemisUser | quote }} +{{- end }} - name: ARTEMIS_PERF_JOURNAL value: {{ default "AUTO" .Values.persistence.testJournalPerformance | quote }} - name: ENABLE_JMX_EXPORTER diff --git a/activemq-artemis/values.yaml b/activemq-artemis/values.yaml index df93a3f..36af664 100644 --- a/activemq-artemis/values.yaml +++ b/activemq-artemis/values.yaml @@ -12,6 +12,9 @@ image: # ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ pullSecrets: [] +# disableSecurity disables activeMQ security features +disableSecurity: false + # artemisUser sets the artemis admin user name artemisUser: artemis # artemisPassword sets the artemis admin user password