move minio from addons to core value set

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

-{{- if and (not .Values.offline) .Values.addons.minio.enabled }}
+{{- if and (not .Values.offline) .Values.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.addons.minio.minioinstance.git.repo }}
+  url: {{ .Values.minio.minioinstance.git.repo }}
   ref:
-    {{- include "validRef" .Values.addons.minio.minioinstance.git | nindent 4 }}
+    {{- include "validRef" .Values.minio.minioinstance.git | nindent 4 }}
   {{ include "gitIgnore" . }}
   {{- include "gitCreds" .Values.git | nindent 2 }}
 {{- end }}

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

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

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

-{{- if .Values.addons.minio.enabled }}
+{{- if .Values.minio.enabled }}
 apiVersion: v1
 kind: Namespace
 metadata:
@@ -6,7 +6,7 @@ metadata:
   labels:
     istio-injection: enabled
 ---
-{{- if ( include "imagePullSecret" . ) }}
+{{- if (   include "imagePullSecret" . ) }}
 apiVersion: v1
 kind: Secret
 metadata:

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

-{{- if and (not .Values.offline) .Values.addons.minio.enabled }}
+{{- if and (not .Values.offline) .Values.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.addons.minio.miniooperator.git.repo }}
+  url: {{ .Values.minio.miniooperator.git.repo }}
   ref:
-    {{- include "validRef" .Values.addons.minio.miniooperator.git | nindent 4 }}
+    {{- include "validRef" .Values.minio.miniooperator.git | nindent 4 }}
   {{ include "gitIgnore" . }}
   {{- include "gitCreds" .Values.git | nindent 2 }}
 {{- end }}

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

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

chart/templates/values.yaml

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

chart/values.yaml

@@ -181,6 +181,24 @@ twistlock:
     tag: "0.0.2-bb.0"
   values: {}
 
+# ----------------------------------------------------------------------------------------------------------------------
+# Minio Operator and Instance
+#
+minio:
+  enabled: true
+  miniooperator:
+    git:
+      repo: https://repo1.dso.mil/platform-one/big-bang/apps/application-utilities/minio-operator.git
+      path: "./chart"
+      branch: "bb-1233"
+    values: {}
+  minioinstance:
+    git:
+      repo: https://repo1.dso.mil/platform-one/big-bang/apps/application-utilities/minio.git
+      path: "./chart"
+      branch: "bb-1233"
+    values: {}
+
 #
 # ----------------------------------------------------------------------------------------------------------------------
 #
@@ -217,27 +235,10 @@ addons:
       path: "./chart"
       tag: "4.2.0-bb.1"
 
-  # ----------------------------------------------------------------------------------------------------------------------
-  # Minio Operator
-  #
-  minio:
-    enabled: true
-    miniooperator:
-      git:
-        repo: https://repo1.dso.mil/platform-one/big-bang/apps/application-utilities/minio-operator.git
-        path: "./chart"
-        branch: "bb-1233"
-      values: {}
-    minioinstance:
-      git:
-        repo: https://repo1.dso.mil/platform-one/big-bang/apps/application-utilities/minio.git
-        path: "./chart"
-        branch: "bb-1233"
-      values: {}
-
   haproxy:
     git:
       repo: https://repo1.dso.mil/platform-one/big-bang/apps/sandbox/haproxy.git
       path: "./chart"
       tag: 1.1.2-bb.0
     values: {}
+