chore(helm): support http protocol for OR acces
This commit is contained in:
parent
e9e2bc1e1e
commit
5f86ae055d
7 changed files with 11 additions and 9 deletions
|
|
@ -71,10 +71,10 @@ spec:
|
|||
value: '{{ .Values.global.postgresql.postgresqlPassword }}'
|
||||
{{- end}}
|
||||
- name: SITE_URL
|
||||
value: 'https://{{ .Values.global.domainName }}'
|
||||
value: '{{ ternary "https" "http" .Values.global.ORSecureAccess}}://{{ .Values.global.domainName }}'
|
||||
- name: S3_HOST
|
||||
{{- if contains "minio" .Values.global.s3.endpoint }}
|
||||
value: 'https://{{ .Values.global.domainName }}:{{ .Values.global.ingress.controller.service.ports.https}}'
|
||||
value: '{{ .Values.global.ORSecureAccess}}://{{ .Values.global.domainName }}:{{ ternary .Values.global.ingress.controller.service.ports.https .Values.global.ingress.controller.service.ports.http .Values.global.ORSecureAccess }}'
|
||||
{{- else}}
|
||||
value: '{{ .Values.global.s3.endpoint }}'
|
||||
{{- end}}
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@ spec:
|
|||
- name: ASSETS_ORIGIN
|
||||
{{- if contains "minio" .Values.global.s3.endpoint }}
|
||||
# Local minio Installation
|
||||
value: 'https://{{ .Values.global.domainName }}:{{.Values.global.ingress.controller.service.ports.https}}/{{.Values.global.s3.assetsBucket}}'
|
||||
value: '{{ .Values.global.ORSecureAccess}}://{{ .Values.global.domainName }}:{{ ternary .Values.global.ingress.controller.service.ports.https .Values.global.ingress.controller.service.ports.http .Values.global.ORSecureAccess }}'
|
||||
{{- else if contains "amazonaws.com" .Values.global.s3.endpoint }}
|
||||
# AWS S3
|
||||
# Ref: https://stackoverflow.com/questions/53634583/go-template-split-string-by-delimiter
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ spec:
|
|||
value: "{{ .Values.global.s3.region }}"
|
||||
- name: S3_HOST
|
||||
{{- if contains "minio" .Values.global.s3.endpoint }}
|
||||
value: 'https://{{ .Values.global.domainName }}:{{ .Values.global.ingress.controller.service.ports.https}}'
|
||||
value: '{{ .Values.global.ORSecureAccess}}://{{ .Values.global.domainName }}:{{ ternary .Values.global.ingress.controller.service.ports.https .Values.global.ingress.controller.service.ports.http .Values.global.ORSecureAccess }}'
|
||||
{{- else}}
|
||||
value: '{{ .Values.global.s3.endpoint }}'
|
||||
{{- end}}
|
||||
|
|
|
|||
|
|
@ -81,10 +81,10 @@ spec:
|
|||
value: '{{ .Values.global.postgresql.postgresqlPassword }}'
|
||||
{{- end}}
|
||||
- name: SITE_URL
|
||||
value: 'https://{{ .Values.global.domainName }}'
|
||||
value: '{{ ternary "https" "http" .Values.global.ORSecureAccess}}://{{ .Values.global.domainName }}'
|
||||
- name: S3_HOST
|
||||
{{- if contains "minio" .Values.global.s3.endpoint }}
|
||||
value: 'https://{{ .Values.global.domainName }}:{{ .Values.global.ingress.controller.service.ports.https}}'
|
||||
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 }}'
|
||||
{{- else}}
|
||||
value: '{{ .Values.global.s3.endpoint }}'
|
||||
{{- end}}
|
||||
|
|
|
|||
|
|
@ -90,7 +90,7 @@ spec:
|
|||
- name: ASSETS_ORIGIN
|
||||
{{- if contains "minio" .Values.global.s3.endpoint }}
|
||||
# Local minio Installation
|
||||
value: 'https://{{ .Values.global.domainName }}:{{.Values.global.ingress.controller.service.ports.https}}/{{.Values.global.s3.assetsBucket}}'
|
||||
value: '{{ .Values.global.ORSecureAccess}}://{{ .Values.global.domainName }}:{{ ternary .Values.global.ingress.controller.service.ports.https .Values.global.ingress.controller.service.ports.http .Values.global.ORSecureAccess }}'
|
||||
{{- else if contains "amazonaws.com" .Values.global.s3.endpoint }}
|
||||
# AWS S3
|
||||
# Ref: https://stackoverflow.com/questions/53634583/go-template-split-string-by-delimiter
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ spec:
|
|||
- name: ASSETS_ORIGIN
|
||||
{{- if contains "minio" .Values.global.s3.endpoint }}
|
||||
# Local minio Installation
|
||||
value: 'https://{{ .Values.global.domainName }}:{{.Values.global.ingress.controller.service.ports.https}}/{{.Values.global.s3.assetsBucket}}'
|
||||
value: '{{ .Values.global.ORSecureAccess}}://{{ .Values.global.domainName }}:{{ ternary .Values.global.ingress.controller.service.ports.https .Values.global.ingress.controller.service.ports.http .Values.global.ORSecureAccess }}'
|
||||
{{- else if contains "amazonaws.com" .Values.global.s3.endpoint }}
|
||||
# AWS S3
|
||||
# Ref: https://stackoverflow.com/questions/53634583/go-template-split-string-by-delimiter
|
||||
|
|
|
|||
|
|
@ -37,5 +37,7 @@ global:
|
|||
vault: *vault
|
||||
redis: *redis
|
||||
clusterDomain: "svc.cluster.local"
|
||||
# In case you've http proxy to access internet.
|
||||
env: {}
|
||||
# If you're accessing OpenReplay with http, then update the value to http
|
||||
ORSecureAccess: true
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue