Skip to content

Commit a4dbbca

Browse files
committed
Default to AZURE_STORAGE in helm chart config
1 parent bfb23d2 commit a4dbbca

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

deploy/helm/ifrcgo-helm/templates/config/configmap.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,12 @@ data:
1616
CACHE_REDIS_URL: {{ required "env.CACHE_REDIS_URL" .Values.env.CACHE_REDIS_URL | quote }}
1717
{{- end }}
1818

19+
{{- if .Values.minio.enabled }}
20+
AWS_S3_ENABLED: "true"
21+
{{- else }}
22+
AZURE_STORAGE_ENABLED: "true"
23+
{{- end }}
24+
1925
CACHE_MIDDLEWARE_SECONDS: {{ .Values.env.CACHE_MIDDLEWARE_SECONDS | quote }}
2026
DJANGO_DEBUG: {{ .Values.env.DJANGO_DEBUG | quote }}
2127
ELASTIC_SEARCH_HOST: {{ default (printf "elasticsearch://%s-elasticsearch:9200" (include "ifrcgo-helm.fullname" .)) .Values.env.ELASTIC_SEARCH_HOST | quote }}

deploy/helm/ifrcgo-helm/templates/config/secret.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,8 @@ stringData:
2525
DJANGO_DB_PORT: {{ .Values.env.DJANGO_DB_PORT | quote }}
2626
{{- end }}
2727

28-
# Minio
2928
{{- if .Values.minio.enabled }}
30-
AWS_S3_ENABLED: "true"
29+
# Minio
3130
AWS_S3_ENDPOINT_URL: "https://{{ .Values.minio.apiIngress.hostname }}/"
3231
AWS_S3_ACCESS_KEY_ID: {{ required ".Values.minio.auth.rootUser" .Values.minio.auth.rootUser }}
3332
AWS_S3_SECRET_ACCESS_KEY: {{ required ".Values.minio.auth.rootPassword" .Values.minio.auth.rootPassword }}
@@ -38,6 +37,7 @@ stringData:
3837

3938
AZURE_STORAGE_ACCOUNT: "{{ .Values.env.AZURE_STORAGE_ACCOUNT }}"
4039
AZURE_STORAGE_KEY: "{{ .Values.env.AZURE_STORAGE_KEY }}"
40+
4141
EMAIL_API_ENDPOINT: "{{ .Values.env.EMAIL_API_ENDPOINT }}"
4242
EMAIL_HOST: "{{ .Values.env.EMAIL_HOST }}"
4343
EMAIL_PORT: "{{ .Values.env.EMAIL_PORT }}"

0 commit comments

Comments
 (0)