Adding minio support to umbrella

CHANGELOG.md

@@ -4,6 +4,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ---
 
+## [1.0.X]
+
+* Added support for deployment of Minio operator and instance deployment of minio.    
+
+
 ## [1.0.6]
 
 * Added [HAProxy Addon](https://repo1.dso.mil/platform-one/big-bang/apps/sandbox/haproxy)

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

+{{- if and (not .Values.offline) .Values.addons.minio.enabled }}
+apiVersion: source.toolkit.fluxcd.io/v1beta1
+kind: GitRepository
+metadata:
+  name: minio
+  namespace: {{ .Release.Namespace }}
+spec:
+  interval: {{ .Values.flux.interval }}
+  url: {{ .Values.addons.minio.minioinstance.git.repo }}
+  ref:
+    {{- include "validRef" .Values.addons.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 }}
+apiVersion: helm.toolkit.fluxcd.io/v2beta1
+kind: HelmRelease
+metadata:
+  name: minio
+  namespace: {{ .Release.Namespace }}
+spec:
+  targetNamespace: minio
+  chart:
+    spec:
+      chart: {{ .Values.addons.minio.minioinstance.git.path }}
+      interval: 5m
+      sourceRef:
+        kind: GitRepository
+        name: minio
+        namespace: {{ .Release.Namespace }}
+
+  {{- with .Values.flux }}
+  interval: {{ .interval }}
+  test:
+    enable: false
+  install:
+    remediation:
+      retries: {{ .install.retries }}
+  upgrade:
+    remediation:
+      retries: {{ .upgrade.retries }}
+      remediateLastFailure: true
+    cleanupOnFail: true
+  rollback:
+    timeout: {{ .rollback.timeout }}
+    cleanupOnFail: {{ .rollback.cleanupOnFail }}
+  {{- end }}
+
+  valuesFrom:
+    - name: values
+      kind: Secret
+      valuesKey: "minio.yaml"
+
+  values:
+    podAnnotations:
+      sidecar.istio.io/inject: "true"
+      traffic.sidecar.istio.io/includeInboundPorts: "*"
+      traffic.sidecar.istio.io/excludeInboundPorts: "9443"
+    imagePullSecrets:
+      - name: private-registry
+
+  dependsOn:
+  {{- if  .Values.gatekeeper.enabled }}
+    - name: gatekeeper
+      namespace: {{ .Release.Namespace }}
+  {{- end }}
+
+  {{- if .Values.istio.enabled }}
+    - name: istio
+      namespace: {{ .Release.Namespace }}
+  {{- end }}
+
+    - name: minio-operator
+      namespace: {{ .Release.Namespace }}
+{{- end }}

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

+{{- if .Values.addons.minio.enabled }}
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: minio
+  labels:
+    istio-injection: enabled
+---
+{{- if ( include "imagePullSecret" . ) }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: private-registry
+  namespace: minio
+type: kubernetes.io/dockerconfigjson
+data:
+  .dockerconfigjson: {{ template "imagePullSecret" . }}
+{{- end }}
+---
+# probably want to get rid of this eventually
+apiVersion: v1
+kind: Secret
+metadata:
+  name: minio-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

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

+{{- if and (not .Values.offline) .Values.addons.minio.enabled }}
+apiVersion: source.toolkit.fluxcd.io/v1beta1
+kind: GitRepository
+metadata:
+  name: minio-operator
+  namespace: {{ .Release.Namespace }}
+spec:
+  interval: {{ .Values.flux.interval }}
+  url: {{ .Values.addons.minio.miniooperator.git.repo }}
+  ref:
+    {{- include "validRef" .Values.addons.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 }}
+apiVersion: helm.toolkit.fluxcd.io/v2beta1
+kind: HelmRelease
+metadata:
+  name: minio-operator
+  namespace: {{ .Release.Namespace }}
+spec:
+  targetNamespace: minio-operator
+  chart:
+    spec:
+      chart: {{ .Values.addons.minio.miniooperator.git.path }}
+      interval: 5m
+      sourceRef:
+        kind: GitRepository
+        name: minio-operator
+        namespace: {{ .Release.Namespace }}
+
+  {{- with .Values.flux }}
+  interval: {{ .interval }}
+  test:
+    enable: false
+  install:
+    remediation:
+      retries: {{ .install.retries }}
+  upgrade:
+    remediation:
+      retries: {{ .upgrade.retries }}
+      remediateLastFailure: true
+    cleanupOnFail: true
+  rollback:
+    timeout: {{ .rollback.timeout }}
+    cleanupOnFail: {{ .rollback.cleanupOnFail }}
+  {{- end }}
+
+  valuesFrom:
+    - name: values
+      kind: Secret
+      valuesKey: "miniooperator.yaml"
+
+  values:
+    podAnnotations:
+      sidecar.istio.io/inject: "true"
+      traffic.sidecar.istio.io/includeInboundPorts: "*"
+      traffic.sidecar.istio.io/excludeInboundPorts: "9443"
+    imagePullSecrets:
+      - name: private-registry
+
+  dependsOn:
+  {{- if .Values.gatekeeper.enabled }}
+    - name: gatekeeper
+      namespace: {{ .Release.Namespace }}
+  {{- end }}
+
+  {{- if .Values.istio.enabled }}
+  - name: istio
+    namespace: {{ .Release.Namespace }}
+  {{- end }}
+
+
+  {{- end }}
\ No newline at end of file

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

+{{- if .Values.addons.minio.enabled }}
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: minio-operator
+  labels:
+    istio-injection: enabled
+---
+{{- if ( include "imagePullSecret" . ) }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: private-registry
+  namespace: minio-operator
+type: kubernetes.io/dockerconfigjson
+data:
+  .dockerconfigjson: {{ template "imagePullSecret" . }}
+{{- end }}
+{{- end }}
\ No newline at end of file

chart/templates/values.yaml

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

chart/values.yaml

@@ -180,8 +180,10 @@ twistlock:
     path: "./chart"
     tag: "0.0.2-bb.0"
   values: {}
-# ----------------------------------------------------------------------------------------------------------------------
 
+#
+# ----------------------------------------------------------------------------------------------------------------------
+#
 addons:
   argocd:
     enabled: false
@@ -215,9 +217,27 @@ 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: {}
\ No newline at end of file
+    values: {}