jan/openreplay
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(helm): respect external proxy variable for assets rewrite

Browse source
This commit is contained in:
rjshrjndrn 2023-12-05 13:27:10 +01:00
parent 99c96582c3
commit 7c550437b4
3 changed files with 3 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
scripts/helmcharts/openreplay/charts/assets/templates/deployment.yaml
View file

@ -89,18 +89,7 @@ spec:
# 4. Using AWS itself. # 4. Using AWS itself.
# AWS uses bucketname.endpoint/object while others use endpoint/bucketname/object # AWS uses bucketname.endpoint/object while others use endpoint/bucketname/object
- name: ASSETS_ORIGIN - name: ASSETS_ORIGIN
{{- if contains "minio" .Values.global.s3.endpoint }} value: "{{ include "openreplay.s3Endpoint" . }}/{{.Values.global.s3.assetsBucket}}"
# 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 }}
{{- include "openreplay.env.redis_string" .Values.global.redis | nindent 12 }} {{- include "openreplay.env.redis_string" .Values.global.redis | nindent 12 }}
ports: ports:
{{- range $key, $val := .Values.service.ports }} {{- range $key, $val := .Values.service.ports }}

13
scripts/helmcharts/openreplay/charts/sink/templates/deployment.yaml
View file

@ -65,18 +65,7 @@ spec:
# 4. Using AWS itself. # 4. Using AWS itself.
# AWS uses bucketname.endpoint/object while others use endpoint/bucketname/object # AWS uses bucketname.endpoint/object while others use endpoint/bucketname/object
- name: ASSETS_ORIGIN - name: ASSETS_ORIGIN
{{- if contains "minio" .Values.global.s3.endpoint }} value: "{{ include "openreplay.s3Endpoint" . }}/{{.Values.global.s3.assetsBucket}}"
# 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 }}
{{- include "openreplay.env.redis_string" .Values.global.redis | nindent 12 }} {{- include "openreplay.env.redis_string" .Values.global.redis | nindent 12 }}
ports: ports:
{{- range $key, $val := .Values.service.ports }} {{- range $key, $val := .Values.service.ports }}

13
scripts/helmcharts/openreplay/charts/sourcemapreader/templates/deployment.yaml
View file

@ -76,18 +76,7 @@ spec:
# 4. Using AWS itself. # 4. Using AWS itself.
# AWS uses bucketname.endpoint/object while others use endpoint/bucketname/object # AWS uses bucketname.endpoint/object while others use endpoint/bucketname/object
- name: ASSETS_ORIGIN - name: ASSETS_ORIGIN
{{- if contains "minio" .Values.global.s3.endpoint }} value: "{{ include "openreplay.s3Endpoint" . }}/{{.Values.global.s3.assetsBucket}}"
# 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 }}
ports: ports:
{{- range $key, $val := .Values.service.ports }} {{- range $key, $val := .Values.service.ports }}
- name: {{ $key }} - name: {{ $key }}