From 89d17e33f9e16b7525e7689520bf89c5a128f750 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Tue, 6 Oct 2020 12:05:34 +0200 Subject: [PATCH] fix es auth (#64) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: André Bauer --- zammad/Chart.yaml | 2 +- zammad/README.md | 4 ++-- zammad/templates/configmap-init.yaml | 2 +- zammad/values.yaml | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/zammad/Chart.yaml b/zammad/Chart.yaml index db9c4fd3..5594ec8a 100644 --- a/zammad/Chart.yaml +++ b/zammad/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: zammad -version: 2.6.1 +version: 2.6.2 appVersion: 3.5.0 description: Zammad is a web based open source helpdesk/customer support system with many features to manage customer communication via several channels like telephone, facebook, twitter, chat and e-mails. home: https://zammad.org diff --git a/zammad/README.md b/zammad/README.md index a91f3592..96a09056 100644 --- a/zammad/README.md +++ b/zammad/README.md @@ -30,7 +30,7 @@ The following table lists the configurable parameters of the zammad chart and th | Parameter | Description | Default | | -------------------------------------------------- | ------------------------------------------------ | ------------------------------- | | `image.repository` | Container image to use | `zammad/zammad-docker-compose` | -| `image.tag` | Container image tag to deploy | `3.5.0-2` | +| `image.tag` | Container image tag to deploy | `3.5.0-5` | | `image.pullPolicy` | Container pull policy | `IfNotPresent` | | `image.imagePullSecrets` | An array of imagePullSecrets | `[]` | | `service.type` | Service type | `ClusterIP` | @@ -77,7 +77,7 @@ The following table lists the configurable parameters of the zammad chart and th | `affinity` | Affinity | `{}` | | `elasticsearch.enabled` | Use Elasticsearch dependency | `true` | | `elasticsearch.image` | Elasticsearch docker image | `zammad/zammad-docker-compose` | -| `elasticsearch.imageTag` | Elasticsearch docker image tag | `zammad-elasticsearch-3.5.0-2` | +| `elasticsearch.imageTag` | Elasticsearch docker image tag | `zammad-elasticsearch-3.5.0-5` | | `elasticsearch.clusterName` | Elasticsearch cluster name | `zammad` | | `elasticsearch.replicas` | Elasticsearch replicas | `1` | | `elasticsearch.clusterHealthCheckParams` | Workaround to get ES test work in GitHubCI | `"timeout=1s"` | diff --git a/zammad/templates/configmap-init.yaml b/zammad/templates/configmap-init.yaml index 688e3721..5f74ab3f 100644 --- a/zammad/templates/configmap-init.yaml +++ b/zammad/templates/configmap-init.yaml @@ -9,7 +9,7 @@ data: #!/bin/bash set -e bundle exec rails r 'Setting.set("es_url", "{{ .Values.envConfig.elasticsearch.schema }}://{{ if .Values.elasticsearch.enabled }}zammad-master{{ else }}{{ .Values.envConfig.elasticsearch.host }}{{ end }}:{{ .Values.envConfig.elasticsearch.port }}")' - {{- if and .Values.elasticsearch.user .Values.elasticsearch.pass }} + {{- if and .Values.envConfig.elasticsearch.user .Values.envConfig.elasticsearch.pass }} bundle exec rails r 'Setting.set("es_user", "{{ .Values.envConfig.elasticsearch.user }}")' bundle exec rails r 'Setting.set("es_password", "{{ .Values.envConfig.elasticsearch.pass }}")' {{ end }} diff --git a/zammad/values.yaml b/zammad/values.yaml index 03f8b46d..3ac7207f 100644 --- a/zammad/values.yaml +++ b/zammad/values.yaml @@ -1,6 +1,6 @@ image: repository: zammad/zammad-docker-compose - tag: 3.5.0-2 + tag: 3.5.0-5 pullPolicy: IfNotPresent imagePullSecrets: [] # - name: "image-pull-secret" @@ -160,7 +160,7 @@ affinity: {} elasticsearch: enabled: true image: "zammad/zammad-docker-compose" - imageTag: "zammad-elasticsearch-3.5.0-2" + imageTag: "zammad-elasticsearch-3.5.0-5" clusterName: zammad replicas: 1 # Workaround to get helm test to work in GitHub action CI