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

fix(helm): proper aws endpoint detection

Browse source 
Signed-off-by: rjshrjndrn <rjshrjndrn@gmail.com>
This commit is contained in:
rjshrjndrn 2025-04-04 23:37:59 +02:00
parent 9160b42113
commit 3f73bae22f
7 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -74,7 +74,7 @@ spec:
- name: LICENSE_KEY - name: LICENSE_KEY
value: '{{ .Values.global.enterpriseEditionLicense }}' value: '{{ .Values.global.enterpriseEditionLicense }}'
- name: AWS_ENDPOINT - name: AWS_ENDPOINT
value: '{{ .Values.global.s3.endpoint }}' value: '{{- include "openreplay.s3Endpoint" . }}'
- name: AWS_REGION - name: AWS_REGION
value: '{{ .Values.global.s3.region }}' value: '{{ .Values.global.s3.region }}'
- name: KAFKA_SERVERS - name: KAFKA_SERVERS

2
scripts/helmcharts/openreplay/charts/canvases/templates/deployment.yaml
View file

@ -62,7 +62,7 @@ spec:
value: {{ .Values.global.s3.secretKey }} value: {{ .Values.global.s3.secretKey }}
{{- end }} {{- end }}
- name: AWS_ENDPOINT - name: AWS_ENDPOINT
value: '{{ .Values.global.s3.endpoint }}' value: '{{- include "openreplay.s3Endpoint" . }}'
- name: AWS_REGION - name: AWS_REGION
value: '{{ .Values.global.s3.region }}' value: '{{ .Values.global.s3.region }}'
- name: BUCKET_NAME - name: BUCKET_NAME

2
scripts/helmcharts/openreplay/charts/connector/templates/deployment.yaml
View file

@ -83,7 +83,7 @@ spec:
value: {{ .Values.global.s3.secretKey }} value: {{ .Values.global.s3.secretKey }}
{{- end }} {{- end }}
- name: AWS_ENDPOINT - name: AWS_ENDPOINT
value: '{{ .Values.global.s3.endpoint }}' value: '{{- include "openreplay.s3Endpoint" . }}'
- name: AWS_REGION - name: AWS_REGION
value: '{{ .Values.global.s3.region }}' value: '{{ .Values.global.s3.region }}'
{{- include "openreplay.env.redis_string" .Values.global.redis | nindent 12 }} {{- include "openreplay.env.redis_string" .Values.global.redis | nindent 12 }}

2
scripts/helmcharts/openreplay/charts/images/templates/deployment.yaml
View file

@ -62,7 +62,7 @@ spec:
value: {{ .Values.global.s3.secretKey }} value: {{ .Values.global.s3.secretKey }}
{{- end }} {{- end }}
- name: AWS_ENDPOINT - name: AWS_ENDPOINT
value: '{{ .Values.global.s3.endpoint }}' value: '{{- include "openreplay.s3Endpoint" . }}'
- name: AWS_REGION - name: AWS_REGION
value: '{{ .Values.global.s3.region }}' value: '{{ .Values.global.s3.region }}'
- name: BUCKET_NAME - name: BUCKET_NAME

2
scripts/helmcharts/openreplay/charts/storage/templates/deployment.yaml
View file

@ -62,7 +62,7 @@ spec:
value: {{ .Values.global.s3.secretKey }} value: {{ .Values.global.s3.secretKey }}
{{- end }} {{- end }}
- name: AWS_ENDPOINT - name: AWS_ENDPOINT
value: '{{ .Values.global.s3.endpoint }}' value: '{{- include "openreplay.s3Endpoint" . }}'
- name: AWS_REGION - name: AWS_REGION
value: '{{ .Values.global.s3.region }}' value: '{{ .Values.global.s3.region }}'
- name: BUCKET_NAME - name: BUCKET_NAME

7
scripts/helmcharts/openreplay/templates/_helpers.tpl
View file

@ -33,10 +33,13 @@ ingress-nginx: &ingress-nginx
{{- if contains "minio" .Values.global.s3.endpoint -}} {{- if contains "minio" .Values.global.s3.endpoint -}}
{{- include "openreplay.domainURL" . -}} {{- include "openreplay.domainURL" . -}}
{{- else -}} {{- else -}}
{{- .Values.global.s3.endpoint -}} {{- .Values.global.s3.endpoint -}}
{{- end -}} {{- end -}}
{{- else -}} {{/* Endpoint wil be empty if used with aws iam roles*/}}
{{- else if and .Values.global.s3.accessKey .Values.global.s3.secretKey -}}
{{- printf "https://s3.%s.amazonaws.com" .Values.global.s3.region -}} {{- printf "https://s3.%s.amazonaws.com" .Values.global.s3.region -}}
{{- else -}}
{{- .Values.global.s3.endpoint -}}
{{- end -}} {{- end -}}
{{- end -}} {{- end -}}

2
scripts/helmcharts/openreplay/templates/job.yaml
View file

@ -404,7 +404,7 @@ spec:
- name: AWS_DEFAULT_REGION - name: AWS_DEFAULT_REGION
value: "{{ .Values.global.s3.region }}" value: "{{ .Values.global.s3.region }}"
- name: AWS_ENDPOINT - name: AWS_ENDPOINT
value: "{{ .Values.global.s3.endpoint }}" value: "{{- include "openreplay.s3Endpoint" . }}"
- name: VAULT_BUCKET - name: VAULT_BUCKET
value: "{{ .Values.global.s3.vaultBucket }}" value: "{{ .Values.global.s3.vaultBucket }}"
image: amazon/aws-cli image: amazon/aws-cli