chart: populate secrets and env when Minio is used

samvera · Apr 20, 2021 · b034218 · b034218
1 parent 075bdb0
commit b034218
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 1 deletion.
diff --git a/chart/hyrax/Chart.yaml b/chart/hyrax/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: hyrax
 description: An open-source, Samvera-powered digital repository system
 type: application
-version: 0.14.0
+version: 0.15.0
 appVersion: 3.0.1
 dependencies:
   - name: fcrepo

diff --git a/chart/hyrax/templates/_helpers.tpl b/chart/hyrax/templates/_helpers.tpl
@@ -82,6 +82,10 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 {{- printf "%s-%s" .Release.Name "memcached" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
+{{- define "hyrax.minio.fullname" -}}
+{{- printf "%s-%s" .Release.Name "minio" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
 {{- define "hyrax.postgresql.fullname" -}}
 {{- printf "%s-%s" .Release.Name "postgresql" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}

diff --git a/chart/hyrax/templates/configmap-env.yaml b/chart/hyrax/templates/configmap-env.yaml
@@ -32,6 +32,9 @@ data:
   FCREPO_REST_PATH: {{ .Values.fcrepo.restPath | default "rest" }}
   {{- end }}
   REDIS_PROVIDER: SIDEKIQ_REDIS_URL
+  {{- if .Values.minio.enabled }}
+  MINIO_ENDPOINT: {{ template "hyrax.minio.fullname" . }}
+  {{- end }}
   SKIP_HYRAX_ENGINE_SEED: {{  .Values.skipHyraxEngineSeed | default 0 | quote }}
   SOLR_ADMIN_USER: {{ template "hyrax.solr.username" . }}
   SOLR_COLLECTION_NAME: {{ template "hyrax.solr.collectionName" . }}

diff --git a/chart/hyrax/templates/secrets.yaml b/chart/hyrax/templates/secrets.yaml
@@ -9,6 +9,10 @@ data:
   SECRET_KEY_BASE: {{ randAlphaNum 20 | b64enc | quote }}
   DB_PASSWORD: {{ include "hyrax.postgresql.password" . | b64enc }}
   DATABASE_URL: {{ printf "postgresql://%s:%s@%s/%s?pool=5" ( include "hyrax.postgresql.username" . ) ( include "hyrax.postgresql.password" . ) ( include "hyrax.postgresql.host" . ) ( include "hyrax.postgresql.database" . ) | b64enc }}
+  {{- if .Values.minio.enabled }}
+  MINIO_ACCESS_KEY: {{ .Values.minio.accessKey.password | b64enc}}
+  MINIO_SECRET_KEY: {{ .Values.minio.secretKey.password | b64enc}}
+  {{- end }}
   {{- if not .Values.solrExistingSecret }}
   SOLR_ADMIN_PASSWORD: {{ include "hyrax.solr.password" . | b64enc }}
   {{- end }}

diff --git a/chart/hyrax/values.yaml b/chart/hyrax/values.yaml
@@ -210,6 +210,7 @@ minio:
     password: hyrax-secret-key
   persistence:
     enabled: false
+  # defaultBuckets: bucketOne;bucketTwo
 
 postgresql:
   enabled: true