From ca78bca3d13614c584e011c0745ae7c304adccc1 Mon Sep 17 00:00:00 2001 From: Alexander Zavorotynskiy Date: Tue, 24 May 2022 13:39:53 +0200 Subject: [PATCH] chore(helmchart): added missed part of yaml file to sink helm chart --- backend/cmd/sink/main.go | 1 - .../openreplay/charts/sink/templates/deployment.yaml | 11 +++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/backend/cmd/sink/main.go b/backend/cmd/sink/main.go index 3c1515aca..a4c76d3f4 100644 --- a/backend/cmd/sink/main.go +++ b/backend/cmd/sink/main.go @@ -67,7 +67,6 @@ func main() { }, false, ) - log.Printf("Sink service started\n") sigchan := make(chan os.Signal, 1) diff --git a/scripts/helmcharts/openreplay/charts/sink/templates/deployment.yaml b/scripts/helmcharts/openreplay/charts/sink/templates/deployment.yaml index 999eb9c74..91e778e07 100644 --- a/scripts/helmcharts/openreplay/charts/sink/templates/deployment.yaml +++ b/scripts/helmcharts/openreplay/charts/sink/templates/deployment.yaml @@ -55,6 +55,17 @@ spec: # AWS uses bucketname.endpoint/object while others use endpoint/bucketname/object - name: ASSETS_ORIGIN {{- if eq .Values.global.s3.endpoint "http://minio.db.svc.cluster.local:9000" }} + # Local minio Installation + value: 'https://{{ .Values.global.domainName }}/{{.Values.global.s3.assetsBucket}}' + {{- else if contains "amazonaws.com" .Values.global.s3.endpoint }} + # AWS S3 + # Ref: https://stackoverflow.com/questions/53634583/go-template-split-string-by-delimiter + # We need https://bucketname.s3endpoint + value: {{ (split "://" .Values.global.s3.endpoint)._0 }}://{{.Values.global.s3.assetsBucket}}.{{ (split "://" .Values.global.s3.endpoint)._1 }} + {{- else }} + # S3 compatible storage + value: '{{ .Values.global.s3.endpoint }}/{{.Values.global.s3.assetsBucket}}' + {{- end }} {{- range $key, $val := .Values.env }} - name: {{ $key }} value: '{{ $val }}'