From f71e99a4376b75ebbb9f635389b29bbc76e39d0d Mon Sep 17 00:00:00 2001
From: Lynn Still <lynn.still@parsons.com>
Date: Tue, 16 Mar 2021 21:35:55 +0000
Subject: [PATCH] Update IB image, add credential settings, service name
 override

---
 chart/templates/minio/minio/minio-helmrelease.yaml |  5 +----
 chart/templates/minio/minio/namespace.yaml         |  8 ++++----
 chart/values.yaml                                  | 12 +++++-------
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/chart/templates/minio/minio/minio-helmrelease.yaml b/chart/templates/minio/minio/minio-helmrelease.yaml
index ab1b49a8e1..b198d7da77 100644
--- a/chart/templates/minio/minio/minio-helmrelease.yaml
+++ b/chart/templates/minio/minio/minio-helmrelease.yaml
@@ -47,10 +47,7 @@ spec:
     hostname: {{ .Values.hostname }}
     istio:
       enabled: {{ .Values.istio.enabled }}
-      virtualService:
-        enabled: {{ .Values.addons.minio.virtualService.enabled }}
-        name: {{ .Values.addons.minio.virtualService.name }}
-    nameOverride: {{ .Values.addons.minio.name }}
+    minioRootCreds: minio-root-creds-secret
     monitoring:
       enabled: {{ .Values.monitoring.enabled }}
 
diff --git a/chart/templates/minio/minio/namespace.yaml b/chart/templates/minio/minio/namespace.yaml
index 22a8cb953f..fc1c96bd61 100644
--- a/chart/templates/minio/minio/namespace.yaml
+++ b/chart/templates/minio/minio/namespace.yaml
@@ -24,10 +24,10 @@ data:
 apiVersion: v1
 kind: Secret
 metadata:
-  name: minio-creds-secret
+  name: minio-root-creds-secret
   namespace: minio
 type: Opaque
 data:
-  accesskey: bWluaW8= # base 64 encoded "minio" (echo -n 'minio' | base64)
-  secretkey: bWluaW8xMjM= # based 64 encoded "minio123" (echo -n 'minio123' | base64)
-{{- end }}
\ No newline at end of file
+  accesskey: {{ .Values.addons.minio.accesskey | default "minio" | b64enc }}
+  secretkey: {{ .Values.addons.minio.secretkey | default "minio123" | b64enc }}
+{{- end }}
diff --git a/chart/values.yaml b/chart/values.yaml
index d12d72a4c0..a2f53ea463 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -335,15 +335,13 @@ addons:
     git:
       repo: https://repo1.dso.mil/platform-one/big-bang/apps/application-utilities/minio.git
       path: "./chart"
-      tag: "2.0.9-bb.3"
+      tag: "2.0.9-bb.5"
 
-    # Provide a specific name for the minio instance.
-    name: minio
+    # -- Default access key to use for minio.
+    accesskey: ""
 
-    # Settings to enable/disable and name the minio virtual service for external access to the minio UI.
-    virtualService:
-      enabled: true
-      name: minio
+    # -- Default secret key to intstantiate with minio, you should change/delete this after installation.
+    secretkey: ""
 
     # -- Values to passthrough to the minio instance chart: https://repo1.dso.mil/platform-one/big-bang/apps/application-utilities/minio.git
     values: {}
-- 
GitLab