a
/
seaweedfs-operator
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'rbac' into peersvc

This commit is contained in:
Howard Lau 2020-10-29 12:00:40 +00:00
parent e8baea6ae4 c5fbce3700
commit a762e9c866
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/v1/seaweed_types.go
View File

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

5
config/crd/bases/seaweed.seaweedfs.com_seaweeds.yaml
View File

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

13
config/samples/seaweed_v1_seaweed.yaml
View File

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