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

remove unused field 

Signed-off-by: Howard Lau <howardlau1999@hotmail.com>
This commit is contained in:
Howard Lau 2020-10-28 05:09:01 +00:00
parent 4f59aa4ada
commit ef177093c7
No known key found for this signature in database
GPG Key ID: 5CCC55849E3CF8E2
2 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
api/v1/seaweed_types.go
View File

@ -46,13 +46,7 @@ type SeaweedSpec struct {
// Filer // Filer
Filer *FilerSpec `json:"filer,omitempty"` Filer *FilerSpec `json:"filer,omitempty"`
// VolumeServerCount is the number of volume servers, default to 1 VolumeServerDiskCount int32 `json:"volumeServerDiskCount,omitempty"`
VolumeServerCount int32 `json:"volumeServerCount,omitempty"`
VolumeServerDiskCount int32 `json:"volumeServerDiskCount,omitempty"`
VolumeServerDiskSizeInGiB int32 `json:"volumeServerDiskSizeInGiB,omitempty"`
// FilerCount is the number of filers, default to 1
FilerCount int32 `json:"filerCount,omitempty"`
// ingress // ingress
Hosts []string `json:"hosts"` Hosts []string `json:"hosts"`
@ -90,7 +84,7 @@ type FilerSpec struct {
corev1.ResourceRequirements `json:",inline"` corev1.ResourceRequirements `json:",inline"`
// The desired ready replicas // The desired ready replicas
// +kubebuilder:validation:Minimum=0 // +kubebuilder:validation:Minimum=1
Replicas int32 `json:"replicas"` Replicas int32 `json:"replicas"`
} }

8
controllers/seaweed_controller.go
View File

@ -50,14 +50,6 @@ func (r *SeaweedReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
return result, err return result, err
} }
// temporary
if seaweedCR.Spec.VolumeServerCount == 0 {
seaweedCR.Spec.VolumeServerCount = 1
}
if seaweedCR.Spec.FilerCount == 0 {
seaweedCR.Spec.FilerCount = 1
}
if done, result, err = r.ensureMaster(seaweedCR); done { if done, result, err = r.ensureMaster(seaweedCR); done {
return result, err return result, err
} }