feat: add s3

metatypedev · May 9, 2024 · 0b42630 · 0b42630
1 parent f1caf1c
commit 0b42630
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 11 deletions.
diff --git a/charts/typegate/Chart.yaml b/charts/typegate/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: typegate
 description: A Helm chart for Typegate
 type: application
-version: 0.2.0
-appVersion: "0.1.7"
+version: 0.3.0
+appVersion: "0.4.1"
 icon: https://metatype.dev/images/logo.svg
 dependencies:
   - name: redis

diff --git a/charts/typegate/templates/deployment.yaml b/charts/typegate/templates/deployment.yaml
@@ -42,9 +42,9 @@ spec:
             {{- toYaml . | nindent 12 }}
           {{- end }}
           env:
-            - name: REDIS_URL
+            - name: SYNC_REDIS_URL
               value: redis://{{ printf "%s-master" (include "common.names.fullname" .Subcharts.redis) }}:{{ .Subcharts.redis.Values.master.service.ports.redis }}/0
-            - name: REDIS_PASSWORD
+            - name: SYNC_REDIS_PASSWORD
               valueFrom:
                 secretKeyRef:
                   name: {{ template "redis.secretName" .Subcharts.redis }}
@@ -53,12 +53,30 @@ spec:
               valueFrom:
                 secretKeyRef:
                   name: {{ default (include "typegate.fullname" .) .Values.auth.existingSecret }}
-                  key: {{ .Values.auth.secretKeys.secretKey }}
+                  key: {{ .Values.auth.secretKeys.secret }}
             - name: TG_ADMIN_PASSWORD
               valueFrom:
                 secretKeyRef:
                   name: {{ default (include "typegate.fullname" .) .Values.auth.existingSecret }}
-                  key: {{ .Values.auth.secretKeys.adminPasswordKey }}
+                  key: {{ .Values.auth.secretKeys.adminPassword }}
+            - name: SYNC_S3_ACCESS_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: {{ default (include "typegate.fullname" .) .Values.s3.existingSecret }}
+                  key: {{ .Values.s3.secretKeys.accessKeyId }}
+            - name: SYNC_S3_SECRET_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: {{ default (include "typegate.fullname" .) .Values.s3.existingSecret }}
+                  key: {{ .Values.s3.secretKeys.secretAccessKey }}
+            - name: SYNC_S3_REGION
+              value: {{ .Values.s3.region }}
+            - name: SYNC_S3_BUCKET
+              value: {{ .Values.s3.bucket }}
+            - name: SYNC_S3_HOST
+              value: {{ .Values.s3.host }}
+            - name: SYNC_S3_PATH_STYLE
+              value: {{ .Values.s3.pathStyle | quote }}
             {{- with .Values.extraEnv }}
             {{- toYaml . | nindent 12 }}
             {{- end }}

diff --git a/charts/typegate/templates/secret.yaml b/charts/typegate/templates/secret.yaml
@@ -5,6 +5,8 @@ metadata:
   name: {{ include "typegate.fullname" . }}
 type: Opaque
 data:
-  {{ .Values.auth.secretKeys.secretKey }}: {{ .Values.auth.secret | b64enc | quote }}
-  {{ .Values.auth.secretKeys.adminPasswordKey }}: {{ .Values.auth.adminPassword | b64enc | quote }}
+  {{ .Values.auth.secretKeys.adminPassword }}: {{ .Values.auth.adminPassword | b64enc | quote }}
+  {{ .Values.auth.secretKeys.secret }}: {{ .Values.auth.secret | b64enc | quote }}
+  {{ .Values.s3.secretKeys.accessKeyId }}: {{ .Values.s3.accessKeyId | b64enc | quote }}
+  {{ .Values.s3.secretKeys.secretAccessKey }}: {{ .Values.s3.secretAccessKey | b64enc | quote }}
 {{- end }}
diff --git a/charts/typegate/values.yaml b/charts/typegate/values.yaml
@@ -4,7 +4,7 @@ image:
   registry: ghcr.io
   repository: metatypedev/typegate
   pullPolicy: IfNotPresent
-  tag: v0.1.14
+  tag: v0.4.1
 
 imagePullSecrets: []
 nameOverride: ""
@@ -19,8 +19,20 @@ auth:
   secret: ""
   existingSecret: ""
   secretKeys:
-    adminPasswordKey: "adminPassword"
-    secretKey: "secret"
+    adminPassword: "adminPassword"
+    secret: "secret"
+
+s3:
+  region: ""
+  bucket: ""
+  host: ""
+  pathStyle: "false"
+  accessKeyId: ""
+  secretAccessKey: ""
+  existingSecret: ""
+  secretKeys:
+    accessKeyId: "accessKeyId"
+    secretAccessKey: "secretAccessKey"
 
 podAnnotations: {}