Split Helm chart templates into separate files (#1677)

minio · Jul 25, 2023 · de854db · de854db
1 parent ef09546
commit de854db
Show file tree

Hide file tree

Showing 13 changed files with 48 additions and 51 deletions.
diff --git a/helm/operator/templates/console-ui.yaml → ...erator/templates/console-clusterrole.yaml b/helm/operator/templates/console-ui.yaml → ...erator/templates/console-clusterrole.yaml
@@ -1,16 +1,3 @@
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: console-sa
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: console-sa-secret
-  annotations:
-    kubernetes.io/service-account.name: console-sa
-type: kubernetes.io/service-account-token
----
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
@@ -248,24 +235,3 @@ rules:
       - get
       - list
       - watch
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: console-sa-binding
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: console-sa-role
-subjects:
-  - kind: ServiceAccount
-    name: console-sa
-    namespace: {{ .Release.Namespace }}
----
-apiVersion: v1
-data:
-  CONSOLE_PORT: "9090"
-  CONSOLE_TLS_PORT: "9443"
-kind: ConfigMap
-metadata:
-  name: console-env
diff --git a/helm/operator/templates/console-clusterrolebinding.yaml b/helm/operator/templates/console-clusterrolebinding.yaml
@@ -0,0 +1,12 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: console-sa-binding
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: console-sa-role
+subjects:
+  - kind: ServiceAccount
+    name: console-sa
+    namespace: {{ .Release.Namespace }}
diff --git a/helm/operator/templates/console-configmap.yaml b/helm/operator/templates/console-configmap.yaml
@@ -0,0 +1,7 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: console-env
+data:
+  CONSOLE_PORT: "9090"
+  CONSOLE_TLS_PORT: "9443"
diff --git a/helm/operator/templates/console-secret.yaml b/helm/operator/templates/console-secret.yaml
@@ -0,0 +1,7 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: console-sa-secret
+  annotations:
+    kubernetes.io/service-account.name: console-sa
+type: kubernetes.io/service-account-token
diff --git a/helm/operator/templates/console-service.yaml b/helm/operator/templates/console-service.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: "console"
+  name: console
   labels: {{- include "minio-operator.labels" . | nindent 4 }}
 spec:
   ports:

diff --git a/helm/operator/templates/console-serviceaccount.yaml b/helm/operator/templates/console-serviceaccount.yaml
@@ -0,0 +1,4 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: console-sa
diff --git a/helm/operator/templates/cluster-role.yaml → ...rator/templates/operator-clusterrole.yaml b/helm/operator/templates/cluster-role.yaml → ...rator/templates/operator-clusterrole.yaml
@@ -139,13 +139,13 @@ rules:
       - create
   - apiGroups:
       - minio.min.io
+      - sts.min.io
     resources:
       - "*"
     verbs:
       - "*"
   - apiGroups:
       - min.io
-      - sts.min.io
     resources:
       - "*"
     verbs:
@@ -175,4 +175,4 @@ rules:
       - list
       - patch
       - update
-      - deletecollection
+      - deletecollection
diff --git a/...rator/templates/cluster-role-binding.yaml → ...emplates/operator-clusterrolebinding.yaml b/...rator/templates/cluster-role-binding.yaml → ...emplates/operator-clusterrolebinding.yaml
diff --git a/helm/operator/templates/operator-deployment.yaml b/helm/operator/templates/operator-deployment.yaml
@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: "minio-operator"
+  name: minio-operator
   labels: {{- include "minio-operator.labels" . | nindent 4 }}
 spec:
   replicas: {{ .Values.operator.replicaCount }}

diff --git a/helm/operator/templates/operator-service.yaml b/helm/operator/templates/operator-service.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: "operator"
+  name: operator
   labels: {{- include "minio-operator.labels" . | nindent 4 }}
 spec:
   type: ClusterIP
@@ -11,15 +11,3 @@ spec:
   selector:
     operator: leader
     {{- include "minio-operator.selectorLabels" . | nindent 4 }}
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: "sts"
-  labels: {{- include "minio-operator.labels" . | nindent 4 }}
-spec:
-  type: ClusterIP
-  ports:
-    - port: 4223
-      name: https
-  selector: {{- include "minio-operator.selectorLabels" . | nindent 4 }}
diff --git a/helm/operator/templates/serviceaccount.yaml → ...or/templates/operator-serviceaccount.yaml b/helm/operator/templates/serviceaccount.yaml → ...or/templates/operator-serviceaccount.yaml
diff --git a/helm/operator/templates/sts-service.yaml b/helm/operator/templates/sts-service.yaml
@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: sts
+  labels: {{- include "minio-operator.labels" . | nindent 4 }}
+spec:
+  type: ClusterIP
+  ports:
+    - port: 4223
+      name: https
+  selector: {{- include "minio-operator.selectorLabels" . | nindent 4 }}
diff --git a/helm/operator/values.yaml b/helm/operator/values.yaml
@@ -9,6 +9,8 @@ operator:
   #     value: "cluster.domain"
   #   - name: WATCHED_NAMESPACE
   #     value: ""
+  #   - name: MINIO_OPERATOR_RUNTIME
+  #     value: "OpenShift"
   image:
     repository: quay.io/minio/operator
     tag: v5.0.6