From 08a0a8cba9fddd890b24f085c31207a77043680b Mon Sep 17 00:00:00 2001 From: Martin Norbury Date: Thu, 5 Dec 2024 14:52:48 +0000 Subject: [PATCH] fix: Update `appVersion` to 0.15.1 (#494) Requires the AES encrypted key produced by the init container to be shared with the main container --- charts/platform/Chart.yaml | 2 +- charts/platform/templates/deployments.yaml | 12 ++++++++++-- charts/platform/templates/secrets.yaml | 3 +-- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/charts/platform/Chart.yaml b/charts/platform/Chart.yaml index 28bdf01d..a40f3bb5 100644 --- a/charts/platform/Chart.yaml +++ b/charts/platform/Chart.yaml @@ -8,7 +8,7 @@ version: 0.2.0 maintainers: - name: mnorbury email: info@cloudquery.io -appVersion: 0.14.2 +appVersion: 0.15.1 dependencies: - name: redis version: ~20.2.1 diff --git a/charts/platform/templates/deployments.yaml b/charts/platform/templates/deployments.yaml index 865d450a..edf9f832 100644 --- a/charts/platform/templates/deployments.yaml +++ b/charts/platform/templates/deployments.yaml @@ -38,6 +38,8 @@ spec: secretKeyRef: name: {{ include "platform.fullName" . }}-secrets key: postgresqlDSN + - name: CQAPI_LOCAL_AES_KEY_FILE + value: /shared/encrypted_aes_key.bin - name: CQAPI_LOCAL_JWT_PRIVATE_KEY_FILE value: /etc/jwt/jwt-private-key.pem volumeMounts: @@ -45,6 +47,8 @@ spec: mountPath: /etc/jwt/jwt-private-key.pem subPath: jwtPrivateKey readOnly: true + - name: shared-data + mountPath: /shared containers: - name: {{ .Chart.Name }} securityContext: @@ -52,8 +56,8 @@ spec: image: "{{ include "platform.image" . }}" imagePullPolicy: {{ .Values.image.pullPolicy }} env: - - name: HOSTNAME - value: 0.0.0.0 + - name: CQAPI_LOCAL_AES_KEY_FILE + value: /shared/encrypted_aes_key.bin {{- if .Values.activationKey }} - name: CQAPI_LOCAL_ACTIVATION_KEY valueFrom: @@ -102,6 +106,8 @@ spec: mountPath: /etc/jwt/jwt-private-key.pem subPath: jwtPrivateKey readOnly: true + - name: shared-data + mountPath: /shared volumes: {{- with .Values.volumes }} {{- toYaml . | nindent 8 }} @@ -109,6 +115,8 @@ spec: - name: jwt-private-key secret: secretName: {{ include "platform.fullName" . }}-secrets + - name: shared-data + emptyDir: {} {{- with .Values.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} diff --git a/charts/platform/templates/secrets.yaml b/charts/platform/templates/secrets.yaml index e08a8f06..a7ed4c01 100644 --- a/charts/platform/templates/secrets.yaml +++ b/charts/platform/templates/secrets.yaml @@ -10,5 +10,4 @@ data: {{- end }} postgresqlDSN: {{ required "A valid postgres DSN is required" .Values.externalDependencies.postgresql_dsn | b64enc }} clickhouseDSN: {{ required "A valid clickhouse DSN is required" .Values.externalDependencies.clickhouse_dsn | b64enc }} - jwtPrivateKey: | - {{ genPrivateKey "rsa" | b64enc }} + jwtPrivateKey: {{ genPrivateKey "rsa" | b64enc }}