[charts][sda-svc] fix s3inbox ENVs

neicnordic · Sep 18, 2023 · 0619bf2 · 0619bf2
1 parent 4344b5f
commit 0619bf2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 17 deletions.
diff --git a/charts/sda-svc/Chart.yaml b/charts/sda-svc/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: sda-svc
-version: "0.20.7"
+version: "0.20.8"
 kubeVersion: ">= 1.19.0-0"
 description: Components for Sensitive Data Archive (SDA) installation
 home: https://neic-sda.readthedocs.io

diff --git a/charts/sda-svc/templates/_helpers.yaml b/charts/sda-svc/templates/_helpers.yaml
@@ -289,14 +289,6 @@ Create chart name and version as used by the chart label.
   {{- end -}}
 {{- end -}}
 
-{{- define "S3InboxURL" -}}
-  {{- if .Values.global.inbox.s3Port }}
-    {{- printf "%s:%v" .Values.global.inbox.s3Url .Values.global.inbox.s3Port }}
-  {{- else }}
-    {{- printf "%s" .Values.global.inbox.s3Url }}
-  {{- end }}
-{{- end -}}
-
 {{- define "S3ArchiveURL" -}}
   {{- if .Values.global.inbox.s3Port }}
     {{- printf "%s:%v" .Values.global.inbox.s3Url .Values.global.inbox.s3Port }}

diff --git a/charts/sda-svc/templates/s3-inbox-deploy.yaml b/charts/sda-svc/templates/s3-inbox-deploy.yaml
@@ -86,12 +86,12 @@ spec:
 {{- end }}
         env:
       {{- if not .Values.global.vaultSecrets }}
-        - name: AWS_ACCESSKEY
+        - name: INBOX_ACCESSKEY
           valueFrom:
               secretKeyRef:
                 name: {{ template "sda.fullname" . }}-inbox
                 key: s3InboxAccessKey
-        - name: AWS_SECRETKEY
+        - name: INBOX_SECRETKEY
           valueFrom:
               secretKeyRef:
                 name: {{ template "sda.fullname" . }}-inbox
@@ -117,20 +117,24 @@ spec:
         - name: SERVER_CONFFILE
           value: {{ include "confFile" .}}
       {{- end }}
-        - name: AWS_URL
-          value: {{ template "S3InboxURL" . }}
+        - name: INBOX_URL
+          value: {{ .Values.global.inbox.s3Url | quote }}
+      {{- if .Values.global.inbox.s3Port }}
+        - name: INBOX_PORT
+          value: {{ .Values.global.inbox.s3Port | quote }}
+      {{- end }}
       {{- if and .Values.global.inbox.s3CaFile .Values.global.tls.enabled }}
-        - name: AWS_CACERT
+        - name: INBOX_CACERT
           value: "{{ include "tlsPath" . }}/ca.crt"
       {{- end }}
       {{- if .Values.global.inbox.s3Region }}
-        - name: AWS_REGION
+        - name: INBOX_REGION
           value: {{ .Values.global.inbox.s3Region | quote }}
       {{- end }}
-        - name: AWS_BUCKET
+        - name: INBOX_BUCKET
           value: {{ .Values.global.inbox.s3Bucket | quote }}
       {{- if .Values.global.inbox.s3ReadyPath }}
-        - name: AWS_READYPATH
+        - name: INBOX_READYPATH
           value: {{ .Values.global.inbox.s3ReadyPath }}
       {{- end }}
         - name: BROKER_HOST