Merge branch 'minio-cleanup' into 'master'

Minio Instance and Operator Helm cleanup, add VS, add customizable name for instance

See merge request platform-one/big-bang/bigbang!288

chart/templates/minio/minio-operator/gitrepository.yaml

-{{- if and (not .Values.offline) .Values.minio.enabled }}
+{{- if and (not .Values.offline) .Values.addons.minioOperator.enabled }}
 apiVersion: source.toolkit.fluxcd.io/v1beta1
 kind: GitRepository
 metadata:
@@ -6,9 +6,9 @@ metadata:
   namespace: {{ .Release.Namespace }}
 spec:
   interval: {{ .Values.flux.interval }}
-  url: {{ .Values.minio.miniooperator.git.repo }}
+  url: {{ .Values.addons.minioOperator.git.repo }}
   ref:
-    {{- include "validRef" .Values.minio.miniooperator.git | nindent 4 }}
+    {{- include "validRef" .Values.addons.minioOperator.git | nindent 4 }}
   {{ include "gitIgnore" . }}
   {{- include "gitCreds" . | nindent 2 }}
 {{- end }}

chart/templates/minio/minio-operator/minio-operator-helmrelease.yaml

-{{- if .Values.minio.enabled }}
+{{- if .Values.addons.minioOperator.enabled }}
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
@@ -8,7 +8,7 @@ spec:
   targetNamespace: minio-operator
   chart:
     spec:
-      chart: {{ .Values.minio.miniooperator.git.path }}
+      chart: {{ .Values.addons.minioOperator.git.path }}
       interval: 5m
       sourceRef:
         kind: GitRepository

chart/templates/minio/minio-operator/namespace.yaml

-{{- if .Values.minio.enabled }}
+{{- if .Values.addons.minioOperator.enabled }}
 apiVersion: v1
 kind: Namespace
 metadata:
   name: minio-operator
   labels:
     istio-injection: enabled
+    app.kubernetes.io/name: minioOperator
+    app.kubernetes.io/component: "application-utilities"
+    {{- include "commonLabels" . | nindent 4}}
+
 ---
 {{- if ( include "imagePullSecret" . ) }}
 apiVersion: v1

chart/templates/minio/minio-instance/gitrepository.yaml → chart/templates/minio/minio/gitrepository.yaml

-{{- if and (not .Values.offline) .Values.minio.enabled }}
+{{- if and (not .Values.offline) .Values.addons.minio.enabled }}
 apiVersion: source.toolkit.fluxcd.io/v1beta1
 kind: GitRepository
 metadata:
@@ -6,9 +6,9 @@ metadata:
   namespace: {{ .Release.Namespace }}
 spec:
   interval: {{ .Values.flux.interval }}
-  url: {{ .Values.minio.minioinstance.git.repo }}
+  url: {{ .Values.addons.minio.git.repo }}
   ref:
-    {{- include "validRef" .Values.minio.minioinstance.git | nindent 4 }}
+    {{- include "validRef" .Values.addons.minio.git | nindent 4 }}
   {{ include "gitIgnore" . }}
   {{- include "gitCreds" . | nindent 2 }}
 {{- end }}

chart/templates/minio/minio-instance/minio-instance-helmrelease.yaml → chart/templates/minio/minio/minio-helmrelease.yaml

-{{- if .Values.minio.enabled }}
+{{- if .Values.addons.minio.enabled }}
 apiVersion: helm.toolkit.fluxcd.io/v2beta1
 kind: HelmRelease
 metadata:
@@ -8,7 +8,7 @@ spec:
   targetNamespace: minio
   chart:
     spec:
-      chart: {{ .Values.minio.minioinstance.git.path }}
+      chart: {{ .Values.addons.minio.git.path }}
       interval: 5m
       sourceRef:
         kind: GitRepository
@@ -44,6 +44,13 @@ spec:
       traffic.sidecar.istio.io/excludeInboundPorts: "9443"
     imagePullSecrets:
       - name: private-registry
+    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 }}
 
   dependsOn:
     - name: minio-operator

chart/templates/minio/minio-instance/namespace.yaml → chart/templates/minio/minio/namespace.yaml

-{{- if .Values.minio.enabled }}
+{{- if .Values.addons.minio.enabled }}
 apiVersion: v1
 kind: Namespace
 metadata:
   name: minio
   labels:
     istio-injection: enabled
+    app.kubernetes.io/name: minio
+    app.kubernetes.io/component: "application-utilities"
+    {{- include "commonLabels" . | nindent 4}}
 ---
 {{- if (   include "imagePullSecret" . ) }}
 apiVersion: v1

chart/templates/values.yaml

@@ -50,9 +50,9 @@ stringData:
   clusterauditor.yaml: |
 {{ toYaml .Values.twistlock.values | indent 4 }}
   miniooperator.yaml: |
-{{ toYaml .Values.minio.miniooperator.values | indent 4 }}
+{{ toYaml .Values.addons.minioOperator.values | indent 4 }}
   minio.yaml: |
-{{ toYaml .Values.minio.minioinstance.values | indent 4 }}
+{{ toYaml .Values.addons.minio.values | indent 4 }}
   gitlab.yaml: |
 {{ toYaml .Values.addons.gitlab.values | indent 4 }}
   anchore.yaml: |

chart/values.yaml

@@ -266,30 +266,6 @@ twistlock:
   # -- Values to passthrough to the twistlock chart: https://repo1.dso.mil/platform-one/big-bang/apps/security-tools/twistlock.git
   values: {}
 
-# ----------------------------------------------------------------------------------------------------------------------
-# Minio Operator and Instance
-#
-minio:
-  # -- Toggle deployment of minio operator and instance.
-  enabled: true
-  miniooperator:
-    git:
-      repo: https://repo1.dso.mil/platform-one/big-bang/apps/application-utilities/minio-operator.git
-      path: "./chart"
-      tag: "2.0.9-bb.1"
-
-    # -- Values to passthrough to the minio operator chart: https://repo1.dso.mil/platform-one/big-bang/apps/application-utilities/minio-operator.git
-    values: {}
-
-  minioinstance:
-    git:
-      repo: https://repo1.dso.mil/platform-one/big-bang/apps/application-utilities/minio.git
-      path: "./chart"
-      tag: "2.0.9-bb.1"
-
-    # -- Values to passthrough to the minio instance chart: https://repo1.dso.mil/platform-one/big-bang/apps/application-utilities/minio.git
-    values: {}
-
 #
 # ----------------------------------------------------------------------------------------------------------------------
 #
@@ -341,6 +317,37 @@ addons:
     # -- Additional authservice chain configurations.
     chains: {}
 
+  # ----------------------------------------------------------------------------------------------------------------------
+  # Minio Operator and Instance
+  #
+  minioOperator:
+    # -- Toggle deployment of minio operator and instance.
+    enabled: false
+    git:
+      repo: https://repo1.dso.mil/platform-one/big-bang/apps/application-utilities/minio-operator.git
+      path: "./chart"
+      tag: "2.0.9-bb.2"
+    # -- Values to passthrough to the minio operator chart: https://repo1.dso.mil/platform-one/big-bang/apps/application-utilities/minio-operator.git
+    values: {}
+
+  minio:
+    enabled: false
+    git:
+      repo: https://repo1.dso.mil/platform-one/big-bang/apps/application-utilities/minio.git
+      path: "./chart"
+      tag: "2.0.9-bb.2"
+
+    # Provide a specific name for the minio instance.
+    name: minio
+
+    # Settings to enable/disable and name the minio virtual service for external access to the minio UI.
+    virtualService:
+      enabled: true
+      name: minio
+
+    # -- Values to passthrough to the minio instance chart: https://repo1.dso.mil/platform-one/big-bang/apps/application-utilities/minio.git
+    values: {}
+
   gitlab:
     # -- Toggle deployment of Gitlab.
     enabled: false