From 3769f16f8672c9f5a3ba0a73fc2d6b69a7c1b0db Mon Sep 17 00:00:00 2001 From: rjshrjndrn Date: Fri, 2 Sep 2022 02:48:51 +0200 Subject: [PATCH] chore(helm): proper port mapping for s3 urls If minio is used, and openreplay is running in custom port, make sure that the port info is passed along to the frontend for replay. --- .../openreplay/charts/alerts/templates/deployment.yaml | 6 +++--- .../openreplay/charts/assist/templates/deployment.yaml | 2 +- .../openreplay/charts/chalice/templates/deployment.yaml | 2 +- .../openreplay/charts/utilities/templates/report-cron.yaml | 2 +- .../charts/utilities/templates/sessions-cleaner-cron.yaml | 2 +- .../charts/utilities/templates/telemetry-cron.yaml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/helmcharts/openreplay/charts/alerts/templates/deployment.yaml b/scripts/helmcharts/openreplay/charts/alerts/templates/deployment.yaml index afb7aedc5..992f67b4d 100644 --- a/scripts/helmcharts/openreplay/charts/alerts/templates/deployment.yaml +++ b/scripts/helmcharts/openreplay/charts/alerts/templates/deployment.yaml @@ -58,10 +58,10 @@ spec: value: 'https://{{ .Values.global.domainName }}' - name: S3_HOST {{- if eq .Values.global.s3.endpoint "http://minio.db.svc.cluster.local:9000" }} - value: 'https://{{ .Values.global.domainName }}' - {{- else }} + value: 'https://{{ .Values.global.domainName }}:{{ .Values.global.ingress.controller.service.ports.https}}' + {{- else}} value: '{{ .Values.global.s3.endpoint }}' - {{- end }} + {{- end}} - name: S3_KEY value: {{ .Values.global.s3.accessKey }} - name: S3_SECRET diff --git a/scripts/helmcharts/openreplay/charts/assist/templates/deployment.yaml b/scripts/helmcharts/openreplay/charts/assist/templates/deployment.yaml index ed4ec5d4a..08fb70ece 100644 --- a/scripts/helmcharts/openreplay/charts/assist/templates/deployment.yaml +++ b/scripts/helmcharts/openreplay/charts/assist/templates/deployment.yaml @@ -46,7 +46,7 @@ spec: value: "{{ .Values.global.s3.region }}" - name: S3_HOST {{- if eq .Values.global.s3.endpoint "http://minio.db.svc.cluster.local:9000" }} - value: 'https://{{ .Values.global.domainName }}' + value: 'https://{{ .Values.global.domainName }}:{{ .Values.global.ingress.controller.service.ports.https}}' {{- else}} value: '{{ .Values.global.s3.endpoint }}' {{- end}} diff --git a/scripts/helmcharts/openreplay/charts/chalice/templates/deployment.yaml b/scripts/helmcharts/openreplay/charts/chalice/templates/deployment.yaml index 9642c53ce..6c9f2beaf 100644 --- a/scripts/helmcharts/openreplay/charts/chalice/templates/deployment.yaml +++ b/scripts/helmcharts/openreplay/charts/chalice/templates/deployment.yaml @@ -60,7 +60,7 @@ spec: value: 'https://{{ .Values.global.domainName }}' - name: S3_HOST {{- if eq .Values.global.s3.endpoint "http://minio.db.svc.cluster.local:9000" }} - value: 'https://{{ .Values.global.domainName }}' + value: 'https://{{ .Values.global.domainName }}:{{ .Values.global.ingress.controller.service.ports.https}}' {{- else}} value: '{{ .Values.global.s3.endpoint }}' {{- end}} diff --git a/scripts/helmcharts/openreplay/charts/utilities/templates/report-cron.yaml b/scripts/helmcharts/openreplay/charts/utilities/templates/report-cron.yaml index 678c15111..0685c7ad2 100644 --- a/scripts/helmcharts/openreplay/charts/utilities/templates/report-cron.yaml +++ b/scripts/helmcharts/openreplay/charts/utilities/templates/report-cron.yaml @@ -36,7 +36,7 @@ spec: value: 'https://{{ .Values.global.domainName }}' - name: S3_HOST {{- if eq .Values.global.s3.endpoint "http://minio.db.svc.cluster.local:9000" }} - value: 'https://{{ .Values.global.domainName }}' + value: 'https://{{ .Values.global.domainName }}:{{ .Values.global.ingress.controller.service.ports.https}}' {{- else}} value: '{{ .Values.global.s3.endpoint }}' {{- end}} diff --git a/scripts/helmcharts/openreplay/charts/utilities/templates/sessions-cleaner-cron.yaml b/scripts/helmcharts/openreplay/charts/utilities/templates/sessions-cleaner-cron.yaml index 2d625e97f..7441ca106 100644 --- a/scripts/helmcharts/openreplay/charts/utilities/templates/sessions-cleaner-cron.yaml +++ b/scripts/helmcharts/openreplay/charts/utilities/templates/sessions-cleaner-cron.yaml @@ -36,7 +36,7 @@ spec: value: 'https://{{ .Values.global.domainName }}' - name: S3_HOST {{- if eq .Values.global.s3.endpoint "http://minio.db.svc.cluster.local:9000" }} - value: 'https://{{ .Values.global.domainName }}' + value: 'https://{{ .Values.global.domainName }}:{{ .Values.global.ingress.controller.service.ports.https}}' {{- else}} value: '{{ .Values.global.s3.endpoint }}' {{- end}} diff --git a/scripts/helmcharts/openreplay/charts/utilities/templates/telemetry-cron.yaml b/scripts/helmcharts/openreplay/charts/utilities/templates/telemetry-cron.yaml index 57de6ce90..92ed861ff 100644 --- a/scripts/helmcharts/openreplay/charts/utilities/templates/telemetry-cron.yaml +++ b/scripts/helmcharts/openreplay/charts/utilities/templates/telemetry-cron.yaml @@ -36,7 +36,7 @@ spec: value: 'https://{{ .Values.global.domainName }}' - name: S3_HOST {{- if eq .Values.global.s3.endpoint "http://minio.db.svc.cluster.local:9000" }} - value: 'https://{{ .Values.global.domainName }}' + value: 'https://{{ .Values.global.domainName }}:{{ .Values.global.ingress.controller.service.ports.https}}' {{- else}} value: '{{ .Values.global.s3.endpoint }}' {{- end}}