Merge branch 'rbac' into peersvc

api/v1/seaweed_types.go

@@ -100,7 +100,7 @@ type SeaweedSpec struct {
 	VolumeServerDiskCount int32 `json:"volumeServerDiskCount,omitempty"`
 
 	// Ingresses
-	Hosts []string `json:"hosts"`
+	Hosts []string `json:"hosts,omitempty"`
 }
 
 // SeaweedStatus defines the observed state of Seaweed
@@ -204,6 +204,7 @@ type ComponentSpec struct {
 	StatefulSetUpdateStrategy appsv1.StatefulSetUpdateStrategyType `json:"statefulSetUpdateStrategy,omitempty"`
 }
 
+// ServiceSpec is a subset of the original k8s spec
 type ServiceSpec struct {
 	// Type of the real kubernetes service
 	Type corev1.ServiceType `json:"type,omitempty"`

config/crd/bases/seaweed.seaweedfs.com_seaweeds.yaml

@@ -3698,6 +3698,7 @@ spec:
                     one if present
                   type: string
                 service:
+                  description: ServiceSpec is a subset of the original k8s spec
                   properties:
                     annotations:
                       additionalProperties:
@@ -6887,6 +6888,7 @@ spec:
                     one if present
                   type: string
                 service:
+                  description: ServiceSpec is a subset of the original k8s spec
                   properties:
                     annotations:
                       additionalProperties:
@@ -10113,6 +10115,7 @@ spec:
                     one if present
                   type: string
                 service:
+                  description: ServiceSpec is a subset of the original k8s spec
                   properties:
                     annotations:
                       additionalProperties:
@@ -10198,8 +10201,6 @@ spec:
             volumeServerDiskCount:
               format: int32
               type: integer
-          required:
-          - hosts
           type: object
         status:
           description: SeaweedStatus defines the observed state of Seaweed

config/samples/seaweed_v1_seaweed.yaml

@@ -5,8 +5,13 @@ metadata:
 spec:
   # Add fields here
   image: chrislusf/seaweedfs:2.07
-  volumeServerCount: 4
-  filerCount: 2
-  hosts:
-    - "*"
+  volumeServerDiskCount: 1
+  master:
+    replicas: 3
+  volume:
+    replicas: 1
+    requests:
+      storage: 2Gi
+  filer:
+    replicas: 2