diff --git a/apps/zammad/templates/deployment.yaml b/apps/zammad/templates/deployment.yaml index bb532e4..9bd4880 100644 --- a/apps/zammad/templates/deployment.yaml +++ b/apps/zammad/templates/deployment.yaml @@ -15,7 +15,7 @@ spec: spec: containers: - name: postgres - image: postgres:13 + image: postgres:14 ports: - containerPort: 5432 envFrom: @@ -69,6 +69,42 @@ spec: volumeMounts: - name: etcletsencrypt mountPath: "/etc/letsencrypt" + - name: change-permissions + image: busybox + command: + - sh + - -c + - chown 1000:0000 /opt/zammad + volumeMounts: + - name: zammad-data + mountPath: "/opt/zammad" + - name: zammad-init + image: zammad/zammad-docker-compose:zammad-{{ .Chart.AppVersion }} + command: + - /docker-entrypoint.sh + - zammad-init + env: + - name: POSTGRESQL_HOST + value: {{ .Release.Name }}-postgres + - name: POSTGRESQL_USER + valueFrom: + secretKeyRef: + name: {{ tpl .Values.identifier . }}-postgres-config + key: POSTGRES_USER + - name: POSTGRESQL_PASSWORD + valueFrom: + secretKeyRef: + name: {{ tpl .Values.identifier . }}-postgres-config + key: POSTGRES_PASSWORD + - name: POSTGRESQL_DB + valueFrom: + secretKeyRef: + name: {{ tpl .Values.identifier . }}-postgres-config + key: POSTGRES_DB + volumeMounts: + - name: zammad-data + mountPath: "/opt/zammad" + containers: - name: nginx image: nginx:1.21-alpine @@ -105,7 +141,15 @@ spec: ports: - containerPort: 11211 - name: elasticsearch - image: zammad/zammad-docker-docker-compose:zammad-elasticsearch-{{ .Chart.AppVersion }} + image: zammad/zammad-docker-compose:zammad-elasticsearch-{{ .Chart.AppVersion }} + env: + - name: discovery.type + value: "single-node" + # Required, because elasticsearch is using chroot() + securityContext: + capabilities: + add: ["SYS_CHROOT"] + #image: docker.elastic.co/elasticsearch/elasticsearch:7.15.0 # resources: # requests: @@ -128,7 +172,7 @@ spec: ports: - containerPort: 6379 - name: zammad - image: zammad/zammad-docker-docker-compose:zammad-{{ .Chart.AppVersion }} + image: zammad/zammad-docker-compose:zammad-{{ .Chart.AppVersion }} # Wait for 10 minutes to get ready # startupProbe: # httpGet: @@ -153,39 +197,41 @@ spec: - containerPort: 8080 name: rails env: - - name: POSTGRES_DB + - name: POSTGRESQL_HOST + value: {{ .Release.Name }}-postgres + - name: POSTGRESQL_USER + valueFrom: + secretKeyRef: + name: {{ tpl .Values.identifier . }}-postgres-config + key: POSTGRES_USER + - name: POSTGRESQL_PASSWORD + valueFrom: + secretKeyRef: + name: {{ tpl .Values.identifier . }}-postgres-config + key: POSTGRES_PASSWORD + - name: POSTGRESQL_DB valueFrom: secretKeyRef: name: {{ tpl .Values.identifier . }}-postgres-config key: POSTGRES_DB - - name: ZAMMAD_TRUSTED_DOMAINS - value: "{{ tpl .Values.fqdn . }}" - - name: ZAMMAD_ADMIN_USER - valueFrom: - secretKeyRef: - name: {{ tpl .Values.identifier . }}-zammad - key: USERNAME + - name: REDIS_URL + value: "redis://localhost:6379" + - name: MEMCACHE_SERVERS + value: "localhost:11211" + - name: ELASTICSEARCH_HOST + value: "localhost" + # - name: ZAMMAD_TRUSTED_DOMAINS + # value: "{{ tpl .Values.fqdn . }}" + # - name: ZAMMAD_ADMIN_USER + # valueFrom: + # secretKeyRef: + # name: {{ tpl .Values.identifier . }}-zammad + # key: USERNAME # - name: ZAMMAD_ADMIN_PASSWORD # valueFrom: # secretKeyRef: # name: {{ tpl .Values.identifier . }}-zammad # key: PASSWORD - - name: POSTGRES_USER - valueFrom: - secretKeyRef: - name: {{ tpl .Values.identifier . }}-postgres-config - key: POSTGRES_USER - - name: POSTGRES_PASSWORD - valueFrom: - secretKeyRef: - name: {{ tpl .Values.identifier . }}-postgres-config - key: POSTGRES_PASSWORD - - name: POSTGRES_HOST - value: {{ .Release.Name }}-postgres - - name: REDIS_URL - value: "redis://localhost:6379" - - name: MEMCACHE_SERVERS - value: "localhost:11211" volumeMounts: - name: zammad-data mountPath: "/opt/zammad"