remove need for specific selector on labels, add current State (#114)

examples/minioinstance.yaml

@@ -40,13 +40,11 @@ metadata:
 # scheduler:
 #  name: my-custom-scheduler
 spec:
-  selector:
-    matchLabels:
-      app: minio # Should match spec.metadata.labels
   ## Add metadata to the all pods created by the StatefulSet
   metadata:
-    labels:
-      app: minio # Should match spec.selector.matchLabels
+    ## Optionally pass labels to be applied to the statefulset pods
+    #labels:
+    #   app: minio
     annotations:
       prometheus.io/path: /minio/prometheus/metrics
       prometheus.io/port: "9000"
@@ -114,12 +112,10 @@ spec:
     replicas: 2
     mcsSecret:
       name: minio-mcs-secret
-    selector:
-      matchLabels:
-        app: mcs # Should match spec.mcs.metadata.labels
-    metadata:
-      labels:
-        app: mcs # Should match spec.mcs.selector.matchLabels
+  ## Optionally metadata can be attached to the mcs pod
+  # metadata:
+  #   labels:
+  #     extra: labels
   ## Add environment variables to be set in MinIO container (https://github.com/minio/minio/tree/master/docs/config)
   env:
     - name: MINIO_BROWSER

minio-operator.yaml

@@ -28,16 +28,52 @@ spec:
                   type: integer
                   minimum: 1
                   maximum: 32
+                image:
+                  type: string
+                serviceName:
+                  type: string
+                volumesPerServer:
+                  type: integer
+                mountPath:
+                  type: string
+                podManagementPolicy:
+                  type: string
+                  enum: [Parallel,OrderedReady]
+                  default: Parallel
+                requestAutoCert:
+                  type: boolean
+                  default: false
                 version:
                   type: string
                 mountpath:
                   type: string
                 subpath:
                   type: string
+                mcs:
+                  type: object
+                  properties:
+                    image:
+                      type: string
+                    replicas:
+                      type: integer
+                      default: 2
+                    mcsSecret:
+                      type: object
+                      properties:
+                        name:
+                          type: string
+            status:
+              type: object
+              properties:
+                currentState:
+                  type: string
+      subresources:
+        # status enables the status subresource.
+        status: {}
       additionalPrinterColumns:
-        - name: Replicas
-          type: integer
-          jsonPath: ".spec.replicas"
+        - name: Current State
+          type: string
+          jsonPath: ".status.currentState"
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition

pkg/apis/operator.min.io/v1/names.go

@@ -127,5 +127,5 @@ func (mi *MinIOInstance) MCSDeploymentName() string {
 
 // MCSCIServiceName returns the name for MCS Cluster IP Service
 func (mi *MinIOInstance) MCSCIServiceName() string {
-	return mi.Name + MCSName + "-service"
+	return mi.Name + MCSName
 }

pkg/apis/operator.min.io/v1/types.go

@@ -130,7 +130,8 @@ type MinIOInstanceSpec struct {
 
 // MinIOInstanceStatus is the status for a MinIOInstance resource
 type MinIOInstanceStatus struct {
-	AvailableReplicas int32 `json:"availableReplicas"`
+	CurrentState      string `json:"currentState"`
+	AvailableReplicas int32  `json:"availableReplicas"`
 }
 
 // CertificateConfig is a specification for certificate contents