Updated function to return updated StatefulSet (#208)

Author: chatton

.gitignore

@@ -75,7 +75,8 @@ tags
 .vscode/*
 .history
 # End of https://www.gitignore.io/api/go,vim,emacs,visualstudiocode
-
+*DS_Store
+*mypy_cache
 .idea
 vendor
 __pycache__

pkg/controller/mongodb/replica_set_controller.go

@@ -353,9 +353,10 @@ func (r *ReplicaSetReconciler) resetStatefulSetUpdateStrategy(mdb mdbv1.MongoDB)
 		return nil
 	}
 	// if we changed the version, we need to reset the UpdatePolicy back to OnUpdate
-	return statefulset.GetAndUpdate(r.client, mdb.NamespacedName(), func(sts *appsv1.StatefulSet) {
+	_, err := statefulset.GetAndUpdate(r.client, mdb.NamespacedName(), func(sts *appsv1.StatefulSet) {
 		sts.Spec.UpdateStrategy.Type = appsv1.RollingUpdateStatefulSetStrategyType
 	})
+	return err
 }
 
 // isStatefulSetReady checks to see if the stateful set corresponding to the given MongoDB resource
@@ -419,7 +420,7 @@ func (r *ReplicaSetReconciler) createOrUpdateStatefulSet(mdb mdbv1.MongoDB) erro
 		return errors.Errorf("error getting StatefulSet: %s", err)
 	}
 	buildStatefulSetModificationFunction(mdb)(&set)
-	if err = statefulset.CreateOrUpdate(r.client, set); err != nil {
+	if _, err = statefulset.CreateOrUpdate(r.client, set); err != nil {
 		return errors.Errorf("error creating/updating StatefulSet: %s", err)
 	}
 	return nil

pkg/kube/client/client.go

@@ -138,8 +138,11 @@ func (c client) GetStatefulSet(objectKey k8sClient.ObjectKey) (appsv1.StatefulSe
 }
 
 // UpdateStatefulSet provides a thin wrapper and client.Client to update appsv1.StatefulSet types
-func (c client) UpdateStatefulSet(sts appsv1.StatefulSet) error {
-	return c.Update(context.TODO(), &sts)
+// the updated StatefulSet is returned
+func (c client) UpdateStatefulSet(sts appsv1.StatefulSet) (appsv1.StatefulSet, error) {
+	stsToUpdate := &sts
+	err := c.Update(context.TODO(), stsToUpdate)
+	return *stsToUpdate, err
 }
 
 // CreateStatefulSet provides a thin wrapper and client.Client to create appsv1.StatefulSet types

pkg/kube/statefulset/statefulset.go

@@ -26,7 +26,7 @@ type Getter interface {
 }
 
 type Updater interface {
-	UpdateStatefulSet(sts appsv1.StatefulSet) error
+	UpdateStatefulSet(sts appsv1.StatefulSet) (appsv1.StatefulSet, error)
 }
 
 type Creator interface {
@@ -57,22 +57,22 @@ type GetUpdateCreateDeleter interface {
 
 // CreateOrUpdate creates the given StatefulSet if it doesn't exist,
 // or updates it if it does.
-func CreateOrUpdate(getUpdateCreator GetUpdateCreator, sts appsv1.StatefulSet) error {
+func CreateOrUpdate(getUpdateCreator GetUpdateCreator, sts appsv1.StatefulSet) (appsv1.StatefulSet, error) {
 	_, err := getUpdateCreator.GetStatefulSet(types.NamespacedName{Name: sts.Name, Namespace: sts.Namespace})
 	if err != nil {
 		if apiErrors.IsNotFound(err) {
-			return getUpdateCreator.CreateStatefulSet(sts)
+			return appsv1.StatefulSet{}, getUpdateCreator.CreateStatefulSet(sts)
 		}
-		return err
+		return appsv1.StatefulSet{}, err
 	}
 	return getUpdateCreator.UpdateStatefulSet(sts)
 }
 
 // GetAndUpdate applies the provided function to the most recent version of the object
-func GetAndUpdate(getUpdater GetUpdater, nsName types.NamespacedName, updateFunc func(*appsv1.StatefulSet)) error {
+func GetAndUpdate(getUpdater GetUpdater, nsName types.NamespacedName, updateFunc func(*appsv1.StatefulSet)) (appsv1.StatefulSet, error) {
 	sts, err := getUpdater.GetStatefulSet(nsName)
 	if err != nil {
-		return err
+		return appsv1.StatefulSet{}, err
 	}
 	// apply the function on the most recent version of the resource
 	updateFunc(&sts)