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

master statefulset ensure consistent style 

fix https://github.com/seaweedfs/seaweedfs-operator/issues/19
This commit is contained in:
Chris Lu 2020-11-04 19:00:34 -08:00
parent 46806156b6
commit 95dc4a247d
1 changed files with 10 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
controllers/controller_master.go
View File

@ -4,8 +4,7 @@ import (
"context" "context"
appsv1 "k8s.io/api/apps/v1" appsv1 "k8s.io/api/apps/v1"
"k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/types"
ctrl "sigs.k8s.io/controller-runtime" ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
@ -37,43 +36,20 @@ func (r *SeaweedReconciler) ensureMaster(seaweedCR *seaweedv1.Seaweed) (done boo
} }
func (r *SeaweedReconciler) ensureMasterStatefulSet(seaweedCR *seaweedv1.Seaweed) (bool, ctrl.Result, error) { func (r *SeaweedReconciler) ensureMasterStatefulSet(seaweedCR *seaweedv1.Seaweed) (bool, ctrl.Result, error) {
ctx := context.Background()
log := r.Log.WithValues("sw-master-statefulset", seaweedCR.Name) log := r.Log.WithValues("sw-master-statefulset", seaweedCR.Name)
masterStatefulSet := &appsv1.StatefulSet{} masterStatefulSet := r.createMasterStatefulSet(seaweedCR)
err := r.Get(ctx, types.NamespacedName{Name: seaweedCR.Name + "-master", Namespace: seaweedCR.Namespace}, masterStatefulSet) if err := controllerutil.SetControllerReference(seaweedCR, masterStatefulSet, r.Scheme); err != nil {
if err != nil && errors.IsNotFound(err) {
// Define a new deployment
dep := r.createMasterStatefulSet(seaweedCR)
if err := controllerutil.SetControllerReference(seaweedCR, dep, r.Scheme); err != nil {
return ReconcileResult(err)
}
log.Info("Creating a new master statefulset", "Namespace", dep.Namespace, "Name", dep.Name)
err = r.Create(ctx, dep)
if err != nil {
log.Error(err, "Failed to create master statefulset", "Namespace", dep.Namespace, "Name", dep.Name)
return ReconcileResult(err) return ReconcileResult(err)
} }
_, err := r.CreateOrUpdate(masterStatefulSet, func(existing, desired runtime.Object) error {
existingStatefulSet := existing.(*appsv1.StatefulSet)
desiredStatefulSet := desired.(*appsv1.StatefulSet)
// StatefulSet created successfully - return and requeue existingStatefulSet.Spec.Template.Spec = desiredStatefulSet.Spec.Template.Spec
return ReconcileResult(err) return nil
} else if err != nil { })
log.Error(err, "Failed to get Deployment") log.Info("ensure master stateful set " + masterStatefulSet.Name)
return ReconcileResult(err)
}
log.Info("master version " + masterStatefulSet.Spec.Template.Spec.Containers[0].Image + " expected " + seaweedCR.Spec.Image)
if masterStatefulSet.Spec.Template.Spec.Containers[0].Image != seaweedCR.Spec.Image {
masterStatefulSet.Spec.Template.Spec.Containers[0].Image = seaweedCR.Spec.Image
if err = r.Update(ctx, masterStatefulSet); err != nil {
log.Error(err, "Failed to update master statefulset", "Namespace", masterStatefulSet.Namespace, "Name", masterStatefulSet.Name)
return ReconcileResult(err)
}
// Deployment created successfully - return and requeue
return ReconcileResult(err)
}
log.Info("Get master stateful set " + masterStatefulSet.Name)
return ReconcileResult(err) return ReconcileResult(err)
} }