From 2f4e4a12a39393e013dc3344d682f45a3ec6c276 Mon Sep 17 00:00:00 2001
From: rjshrjndrn <rjshrjndrn@gmail.com>
Date: Fri, 4 Nov 2022 15:42:01 +0100
Subject: [PATCH] fix(helm): proper port injection while using custom port for
 https

---
 .../openreplay/charts/assets/templates/deployment.yaml          | 2 +-
 .../openreplay/charts/frontend/templates/deployment.yaml        | 2 +-
 .../helmcharts/openreplay/charts/http/templates/deployment.yaml | 2 +-
 .../helmcharts/openreplay/charts/sink/templates/deployment.yaml | 2 +-
 .../openreplay/charts/sourcemapreader/templates/deployment.yaml | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/helmcharts/openreplay/charts/assets/templates/deployment.yaml b/scripts/helmcharts/openreplay/charts/assets/templates/deployment.yaml
index 2a6aaf0ef..3a60c45f1 100644
--- a/scripts/helmcharts/openreplay/charts/assets/templates/deployment.yaml
+++ b/scripts/helmcharts/openreplay/charts/assets/templates/deployment.yaml
@@ -71,7 +71,7 @@ spec:
             - 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}}'
+              value: 'https://{{ .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: https://stackoverflow.com/questions/53634583/go-template-split-string-by-delimiter
diff --git a/scripts/helmcharts/openreplay/charts/frontend/templates/deployment.yaml b/scripts/helmcharts/openreplay/charts/frontend/templates/deployment.yaml
index 34cb53fd9..90501f5c7 100644
--- a/scripts/helmcharts/openreplay/charts/frontend/templates/deployment.yaml
+++ b/scripts/helmcharts/openreplay/charts/frontend/templates/deployment.yaml
@@ -69,7 +69,7 @@ spec:
             - name: ASSETS_ORIGIN
             {{- if eq .Values.global.s3.endpoint "frontend://minio.db.svc.cluster.local:9000" }}
               # Local minio Installation
-              value: 'frontends://{{ .Values.global.domainName }}/{{.Values.global.s3.assetsBucket}}'
+              value: 'frontends://{{ .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: frontends://stackoverflow.com/questions/53634583/go-template-split-string-by-delimiter
diff --git a/scripts/helmcharts/openreplay/charts/http/templates/deployment.yaml b/scripts/helmcharts/openreplay/charts/http/templates/deployment.yaml
index 0924f3b4c..4475e0d0d 100644
--- a/scripts/helmcharts/openreplay/charts/http/templates/deployment.yaml
+++ b/scripts/helmcharts/openreplay/charts/http/templates/deployment.yaml
@@ -69,7 +69,7 @@ spec:
             - 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}}'
+              value: 'https://{{ .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: https://stackoverflow.com/questions/53634583/go-template-split-string-by-delimiter
diff --git a/scripts/helmcharts/openreplay/charts/sink/templates/deployment.yaml b/scripts/helmcharts/openreplay/charts/sink/templates/deployment.yaml
index 7c953f963..d3d092a8d 100644
--- a/scripts/helmcharts/openreplay/charts/sink/templates/deployment.yaml
+++ b/scripts/helmcharts/openreplay/charts/sink/templates/deployment.yaml
@@ -61,7 +61,7 @@ spec:
             - 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}}'
+              value: 'https://{{ .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: https://stackoverflow.com/questions/53634583/go-template-split-string-by-delimiter
diff --git a/scripts/helmcharts/openreplay/charts/sourcemapreader/templates/deployment.yaml b/scripts/helmcharts/openreplay/charts/sourcemapreader/templates/deployment.yaml
index 2fcd0c6df..d15cf7c8f 100644
--- a/scripts/helmcharts/openreplay/charts/sourcemapreader/templates/deployment.yaml
+++ b/scripts/helmcharts/openreplay/charts/sourcemapreader/templates/deployment.yaml
@@ -69,7 +69,7 @@ spec:
             - name: ASSETS_ORIGIN
             {{- if eq .Values.global.s3.endpoint "sourcemapreader://minio.db.svc.cluster.local:9000" }}
               # Local minio Installation
-              value: 'sourcemapreaders://{{ .Values.global.domainName }}/{{.Values.global.s3.assetsBucket}}'
+              value: 'sourcemapreaders://{{ .Values.global.domainName }}:{{.Values.global.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