From 9dc9f15ed0d1945809c77342d19f244ed4815b86 Mon Sep 17 00:00:00 2001
From: rjshrjndrn <rjshrjndrn@gmail.com>
Date: Tue, 5 Dec 2023 13:27:10 +0100
Subject: [PATCH] fix(helm): respect external proxy variable for assets rewrite

---
 .../charts/assets/templates/deployment.yaml         | 13 +------------
 .../charts/sink/templates/deployment.yaml           | 13 +------------
 .../sourcemapreader/templates/deployment.yaml       | 13 +------------
 3 files changed, 3 insertions(+), 36 deletions(-)

diff --git a/scripts/helmcharts/openreplay/charts/assets/templates/deployment.yaml b/scripts/helmcharts/openreplay/charts/assets/templates/deployment.yaml
index 3104cffd0..eb6e5ce58 100644
--- a/scripts/helmcharts/openreplay/charts/assets/templates/deployment.yaml
+++ b/scripts/helmcharts/openreplay/charts/assets/templates/deployment.yaml
@@ -89,18 +89,7 @@ spec:
             # 4. Using AWS itself.
             # AWS uses bucketname.endpoint/object while others use endpoint/bucketname/object
             - name: ASSETS_ORIGIN
-            {{- if contains "minio" .Values.global.s3.endpoint }}
-              # Local minio Installation
-              value: '{{ ternary "https" "http" .Values.global.ORSecureAccess}}://{{ .Values.global.domainName }}:{{ ternary .Values.global.ingress.controller.service.ports.https .Values.global.ingress.controller.service.ports.http .Values.global.ORSecureAccess }}/{{.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 }}
+              value: "{{ include "openreplay.s3Endpoint" . }}/{{.Values.global.s3.assetsBucket}}"
             {{- include "openreplay.env.redis_string" .Values.global.redis | nindent 12 }}
           ports:
             {{- range $key, $val := .Values.service.ports }}
diff --git a/scripts/helmcharts/openreplay/charts/sink/templates/deployment.yaml b/scripts/helmcharts/openreplay/charts/sink/templates/deployment.yaml
index d17235650..9f1329d84 100644
--- a/scripts/helmcharts/openreplay/charts/sink/templates/deployment.yaml
+++ b/scripts/helmcharts/openreplay/charts/sink/templates/deployment.yaml
@@ -65,18 +65,7 @@ spec:
             # 4. Using AWS itself.
             # AWS uses bucketname.endpoint/object while others use endpoint/bucketname/object
             - name: ASSETS_ORIGIN
-            {{- if contains "minio" .Values.global.s3.endpoint }}
-              # Local minio Installation
-              value: '{{ ternary "https" "http" .Values.global.ORSecureAccess}}://{{ .Values.global.domainName }}:{{ ternary .Values.global.ingress.controller.service.ports.https .Values.global.ingress.controller.service.ports.http .Values.global.ORSecureAccess }}/{{.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 }}
+              value: "{{ include "openreplay.s3Endpoint" . }}/{{.Values.global.s3.assetsBucket}}"
             {{- include "openreplay.env.redis_string" .Values.global.redis | nindent 12 }}
           ports:
             {{- range $key, $val := .Values.service.ports }}
diff --git a/scripts/helmcharts/openreplay/charts/sourcemapreader/templates/deployment.yaml b/scripts/helmcharts/openreplay/charts/sourcemapreader/templates/deployment.yaml
index bb5086ca7..76c3f7ba7 100644
--- a/scripts/helmcharts/openreplay/charts/sourcemapreader/templates/deployment.yaml
+++ b/scripts/helmcharts/openreplay/charts/sourcemapreader/templates/deployment.yaml
@@ -76,18 +76,7 @@ spec:
             # 4. Using AWS itself.
             # AWS uses bucketname.endpoint/object while others use endpoint/bucketname/object
             - name: ASSETS_ORIGIN
-            {{- if contains "minio" .Values.global.s3.endpoint }}
-              # Local minio Installation
-              value: 'sourcemapreaders://{{ .Values.global.domainName }}:{{.Values.global.ingress.controller.service.ports.https}}/{{.Values.global.s3.assetsBucket}}'
-            {{- else if contains "amazonaws.com" .Values.global.s3.endpoint }}
-              # AWS S3
-              # Ref: sourcemapreaders://stackoverflow.com/questions/53634583/go-template-split-string-by-delimiter
-              # We need sourcemapreaders://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 }}
+              value: "{{ include "openreplay.s3Endpoint" . }}/{{.Values.global.s3.assetsBucket}}"
           ports:
             {{- range $key, $val := .Values.service.ports }}
             - name: {{ $key }}