diff --git a/.gitignore b/.gitignore index dfd191d78a20a78978a48ac5f26887c6970380ef..1634e472c867ed08f5d12408514b080906613dee 100644 --- a/.gitignore +++ b/.gitignore @@ -126,4 +126,5 @@ Thumbs.db output package-lock.json helm/core-ui-middleware/charts/ +helm/core-ui-middleware/Chart.lock .pnpm-store diff --git a/helm/core-ui-middleware/Chart.lock b/helm/core-ui-middleware/Chart.lock deleted file mode 100644 index 1fc5f8623fbc37aa20d3e44448943e40a342bffe..0000000000000000000000000000000000000000 --- a/helm/core-ui-middleware/Chart.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: ox-common - repository: oci://registry.open-xchange.com/appsuite-core-internal/charts - version: 1.0.41 -digest: sha256:c86cf38308398f1458863f3b6f8f9aa35effd251df7ba847547b40dacdaab99e -generated: "2024-05-16T10:39:00.523895345Z" diff --git a/helm/core-ui-middleware/Chart.yaml b/helm/core-ui-middleware/Chart.yaml index 8e41c710ae369962f221868e677f5390d56cac1e..f063e345ce284f2fa20b4bfdf60a6270cee39047 100644 --- a/helm/core-ui-middleware/Chart.yaml +++ b/helm/core-ui-middleware/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 3.0.9 +version: 3.0.10 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/helm/core-ui-middleware/templates/deployment.yaml b/helm/core-ui-middleware/templates/deployment.yaml index fcff7d5459a93fe952bb688c171bbfcd2a8c25dc..7474aca1d4c0152d0b8ae5a2ef14b09e1bdb3e24 100644 --- a/helm/core-ui-middleware/templates/deployment.yaml +++ b/helm/core-ui-middleware/templates/deployment.yaml @@ -139,10 +139,29 @@ spec: value: "{{ .Values.redis.hosts | join "," }}" - name: REDIS_DB value: "{{ .Values.redis.db | int }}" + {{- if .Values.redis.auth.enabled }} + - name: REDIS_USERNAME + valueFrom: + secretKeyRef: + name: {{ include "core-ui-middleware.redisSecret" . }} + key: username - name: REDIS_PASSWORD - value: "{{ .Values.redis.password }}" + valueFrom: + secretKeyRef: + name: {{ include "core-ui-middleware.redisSecret" . }} + key: password + {{- end }} - name: REDIS_PREFIX value: "{{ .Values.redis.prefix }}" + - name: REDIS_TLS_ENABLED + value: "{{ .Values.redis.tls.enabled }}" + {{- if .Values.redis.tls.enabled }} + - name: REDIS_TLS_CA + valueFrom: + secretKeyRef: + name: {{ include "core-ui-middleware.redisSecret" . }} + key: ca.crt + {{- end }} resources: {{- toYaml .Values.updater.resources | nindent 12 }} volumeMounts: diff --git a/helm/core-ui-middleware/templates/redis-secret.yaml b/helm/core-ui-middleware/templates/redis-secret.yaml index 5a160d9b3c6255209b6b3e50b108449cafc6cf36..b4247c154e31359faac1a122401cca72694e30d4 100644 --- a/helm/core-ui-middleware/templates/redis-secret.yaml +++ b/helm/core-ui-middleware/templates/redis-secret.yaml @@ -1,4 +1,4 @@ -{{- if or .Values.redis.auth.enabled .Values.redis.tls.enabled -}} +{{- if and (or .Values.redis.auth.enabled .Values.redis.tls.enabled) (not .Values.overrides.redisSecret) -}} apiVersion: v1 kind: Secret metadata: @@ -7,5 +7,7 @@ type: Opaque data: username: {{ .Values.redis.auth.username | b64enc | quote }} password: {{ .Values.redis.auth.password | b64enc | quote }} + {{- if and .Values.redis.tls.enabled .Values.redis.tls.ca }} ca.crt: {{ .Values.redis.tls.ca | b64enc | quote }} + {{- end }} {{- end -}} diff --git a/helm/core-ui-middleware/values.yaml b/helm/core-ui-middleware/values.yaml index 0842833c935643c86476fd230e820a9731010bec..72cde6262a98bb0d9c5b8d1909561c3b489850a1 100644 --- a/helm/core-ui-middleware/values.yaml +++ b/helm/core-ui-middleware/values.yaml @@ -14,7 +14,7 @@ defaultRegistry: registry.open-xchange.com containerPort: 8080 image: - repository: "core-ui-middleware" + repository: "appsuite-core-internal/core-ui-middleware" pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. tag: "" @@ -22,6 +22,8 @@ image: imagePullSecrets: [] nameOverride: "" fullnameOverride: "" +overrides: {} +# redisSecret: "" podAnnotations: logging.open-xchange.com/format: "appsuite-json"