chore(helm): Adding support for global env variables

This commit is contained in:
rjshrjndrn 2023-02-23 18:08:09 +01:00
parent 0d21010080
commit 3f42f7b9e7
17 changed files with 90 additions and 0 deletions

View file

@ -116,6 +116,10 @@ spec:
value: '{{ .Values.global.email.emailSslCert }}'
- name: EMAIL_FROM
value: '{{ .Values.global.email.emailFrom }}'
{{- range $key, $val := .Values.global.env }}
- name: {{ $key }}
value: '{{ $val }}'
{{- end }}
{{- range $key, $val := .Values.env }}
- name: {{ $key }}
value: '{{ $val }}'

View file

@ -94,6 +94,10 @@ spec:
value: '{{ .Values.global.s3.endpoint }}/{{.Values.global.s3.assetsBucket}}'
{{- end }}
{{- include "openreplay.env.redis_string" .Values.global.redis | nindent 12 }}
{{- range $key, $val := .Values.global.env }}
- name: {{ $key }}
value: '{{ $val }}'
{{- end }}
{{- range $key, $val := .Values.env }}
- name: {{ $key }}
value: '{{ $val }}'

View file

@ -75,6 +75,10 @@ spec:
{{- end }}
- name: REDIS_URL
value: {{ .Values.global.redis.redisHost }}
{{- range $key, $val := .Values.global.env }}
- name: {{ $key }}
value: '{{ $val }}'
{{- end }}
{{- range $key, $val := .Values.env }}
- name: {{ $key }}
value: '{{ $val }}'

View file

@ -134,6 +134,10 @@ spec:
value: '{{ .Values.global.email.emailSslCert }}'
- name: EMAIL_FROM
value: '{{ .Values.global.email.emailFrom }}'
{{- range $key, $val := .Values.global.env }}
- name: {{ $key }}
value: '{{ $val }}'
{{- end }}
{{- range $key, $val := .Values.env }}
- name: {{ $key }}
value: '{{ $val }}'

View file

@ -69,6 +69,10 @@ spec:
- name: POSTGRES_STRING
value: 'postgres://{{ .Values.global.postgresql.postgresqlUser }}:$(pg_password)@{{ .Values.global.postgresql.postgresqlHost }}:{{ .Values.global.postgresql.postgresqlPort }}/{{ .Values.global.postgresql.postgresqlDatabase }}'
{{- include "openreplay.env.redis_string" .Values.global.redis | nindent 12 }}
{{- range $key, $val := .Values.global.env }}
- name: {{ $key }}
value: '{{ $val }}'
{{- end }}
{{- range $key, $val := .Values.env }}
- name: {{ $key }}
value: '{{ $val }}'

View file

@ -61,6 +61,10 @@ spec:
- name: POSTGRES_STRING
value: 'postgres://{{ .Values.global.postgresql.postgresqlUser }}:$(pg_password)@{{ .Values.global.postgresql.postgresqlHost }}:{{ .Values.global.postgresql.postgresqlPort }}/{{ .Values.global.postgresql.postgresqlDatabase }}'
{{- include "openreplay.env.redis_string" .Values.global.redis | nindent 12 }}
{{- range $key, $val := .Values.global.env }}
- name: {{ $key }}
value: '{{ $val }}'
{{- end }}
{{- range $key, $val := .Values.env }}
- name: {{ $key }}
value: '{{ $val }}'

View file

@ -101,6 +101,10 @@ spec:
value: '{{ .Values.global.s3.endpoint }}/{{.Values.global.s3.assetsBucket}}'
{{- end }}
{{- include "openreplay.env.redis_string" .Values.global.redis | nindent 12 }}
{{- range $key, $val := .Values.global.env }}
- name: {{ $key }}
value: '{{ $val }}'
{{- end }}
{{- range $key, $val := .Values.env }}
- name: {{ $key }}
value: '{{ $val }}'

View file

@ -50,6 +50,10 @@ spec:
- name: KAFKA_USE_SSL
value: '{{ .Values.global.kafka.kafkaUseSsl }}'
{{- include "openreplay.env.redis_string" .Values.global.redis | nindent 12 }}
{{- range $key, $val := .Values.global.env }}
- name: {{ $key }}
value: '{{ $val }}'
{{- end }}
{{- range $key, $val := .Values.env }}
- name: {{ $key }}
value: '{{ $val }}'

View file

@ -101,6 +101,10 @@ spec:
value: '{{ .Values.global.s3.endpoint }}/{{.Values.global.s3.assetsBucket}}'
{{- end }}
{{- include "openreplay.env.redis_string" .Values.global.redis | nindent 12 }}
{{- range $key, $val := .Values.global.env }}
- name: {{ $key }}
value: '{{ $val }}'
{{- end }}
{{- range $key, $val := .Values.env }}
- name: {{ $key }}
value: '{{ $val }}'

View file

@ -61,6 +61,10 @@ spec:
- name: POSTGRES_STRING
value: 'postgres://{{ .Values.global.postgresql.postgresqlUser }}:$(pg_password)@{{ .Values.global.postgresql.postgresqlHost }}:{{ .Values.global.postgresql.postgresqlPort }}/{{ .Values.global.postgresql.postgresqlDatabase }}'
{{- include "openreplay.env.redis_string" .Values.global.redis | nindent 12 }}
{{- range $key, $val := .Values.global.env }}
- name: {{ $key }}
value: '{{ $val }}'
{{- end }}
{{- range $key, $val := .Values.env }}
- name: {{ $key }}
value: '{{ $val }}'

View file

@ -54,6 +54,10 @@ spec:
{{- else }}
value: {{ .Values.global.s3.accessKey }}
{{- end }}
{{- range $key, $val := .Values.global.env }}
- name: {{ $key }}
value: '{{ $val }}'
{{- end }}
{{- range $key, $val := .Values.env }}
- name: {{ $key }}
value: '{{ $val }}'

View file

@ -57,6 +57,10 @@ spec:
value: {{ .Values.global.s3.secretKey }}
- name: QW_DATA_DIR
value: /opt/openreplay/
{{- range $key, $val := .Values.global.env }}
- name: {{ $key }}
value: '{{ $val }}'
{{- end }}
ports:
{{- range $key, $val := .Values.service.ports }}
- name: {{ $key }}

View file

@ -70,6 +70,10 @@ spec:
value: '{{ .Values.global.s3.endpoint }}/{{.Values.global.s3.assetsBucket}}'
{{- end }}
{{- include "openreplay.env.redis_string" .Values.global.redis | nindent 12 }}
{{- range $key, $val := .Values.global.env }}
- name: {{ $key }}
value: '{{ $val }}'
{{- end }}
{{- range $key, $val := .Values.env }}
- name: {{ $key }}
value: '{{ $val }}'

View file

@ -79,6 +79,10 @@ spec:
# S3 compatible storage
value: '{{ .Values.global.s3.endpoint }}/{{.Values.global.s3.assetsBucket}}'
{{- end }}
{{- range $key, $val := .Values.global.env }}
- name: {{ $key }}
value: '{{ $val }}'
{{- end }}
{{- range $key, $val := .Values.env }}
- name: {{ $key }}
value: '{{ $val }}'

View file

@ -78,6 +78,10 @@ spec:
- name: KAFKA_USE_SSL
value: '{{ .Values.global.kafka.kafkaUseSsl }}'
{{- include "openreplay.env.redis_string" .Values.global.redis | nindent 12 }}
{{- range $key, $val := .Values.global.env }}
- name: {{ $key }}
value: '{{ $val }}'
{{- end }}
{{- range $key, $val := .Values.env }}
- name: {{ $key }}
value: '{{ $val }}'

View file

@ -35,6 +35,10 @@ spec:
- name: git
image: alpine/git
env:
{{- range $key, $val := .Values.global.env }}
- name: {{ $key }}
value: '{{ $val }}'
{{- end }}
- name: ENTERPRISE_EDITION_LICENSE
value: "{{ .Values.global.enterpriseEditionLicense }}"
command:
@ -107,6 +111,10 @@ spec:
{{- else }}
value: '{{ .Values.global.postgresql.postgresqlPassword }}'
{{- end}}
{{- range $key, $val := .Values.global.env }}
- name: {{ $key }}
value: '{{ $val }}'
{{- end }}
image: bitnami/postgresql:13.3.0-debian-10-r53
command:
- /bin/bash
@ -122,6 +130,10 @@ spec:
- name: minio
image: bitnami/minio:2020.10.9-debian-10-r6
env:
{{- range $key, $val := .Values.global.env }}
- name: {{ $key }}
value: '{{ $val }}'
{{- end }}
- name: FORCE_MIGRATION
value: "{{ .Values.forceMigration }}"
- name: UPGRADE_FRONTENT
@ -152,6 +164,10 @@ spec:
{{- if .Values.vault.enabled }}
- name: vault
env:
{{- range $key, $val := .Values.global.env }}
- name: {{ $key }}
value: '{{ $val }}'
{{- end }}
- name: FORCE_MIGRATION
value: "{{ .Values.forceMigration }}"
- name: PGHOST
@ -177,6 +193,10 @@ spec:
mountPath: /opt/migrations/
- name: vault-s3-upload
env:
{{- range $key, $val := .Values.global.env }}
- name: {{ $key }}
value: '{{ $val }}'
{{- end }}
- name: AWS_ACCESS_KEY_ID
value: "{{ .Values.global.s3.accessKey }}"
- name: AWS_SECRET_ACCESS_KEY
@ -221,6 +241,10 @@ spec:
- name: clickhouse
image: clickhouse/clickhouse-server:22.12-alpine
env:
{{- range $key, $val := .Values.global.env }}
- name: {{ $key }}
value: '{{ $val }}'
{{- end }}
- name: FORCE_MIGRATION
value: "{{ .Values.forceMigration }}"
- name: PREVIOUS_APP_VERSION
@ -248,6 +272,10 @@ spec:
- name: kafka
image: bitnami/kafka:2.6.0-debian-10-r30
env:
{{- range $key, $val := .Values.global.env }}
- name: {{ $key }}
value: '{{ $val }}'
{{- end }}
- name: RETENTION_TIME
value: "{{ .Values.global.kafka.retentionTime }}"
- name: KAFKA_HOST

View file

@ -37,3 +37,5 @@ global:
vault: *vault
redis: *redis
clusterDomain: "svc.cluster.local"
# In case you've http proxy to access internet.
env: {}