Merge pull request #14 from vshn/fix/panic-on-not-found

Fix panic when StatefulSet is not found
vshn · Sep 1, 2021 · c0f1abf · c0f1abf
2 parents d29f502 + 3b022ef
commit c0f1abf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/controllers/controller.go b/controllers/controller.go
@@ -35,8 +35,7 @@ func (r *StatefulSetReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 
 	sts, err := r.fetchStatefulSet(ctx, req.NamespacedName)
 	if err != nil {
-		l.Error(err, "Unable to fetch StatefulSet")
-		return ctrl.Result{}, err
+		return ctrl.Result{}, client.IgnoreNotFound(err)
 	}
 	if !sts.Resizing() || sts.Failed() {
 		return ctrl.Result{}, nil

diff --git a/controllers/statefulset.go b/controllers/statefulset.go
@@ -8,7 +8,6 @@ import (
 
 	appsv1 "k8s.io/api/apps/v1"
 	"k8s.io/apimachinery/pkg/types"
-	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 
 	"github.com/vshn/statefulset-resize-controller/statefulset"
@@ -43,7 +42,7 @@ func (r StatefulSetReconciler) fetchStatefulSet(ctx context.Context, namespacedN
 	old := &appsv1.StatefulSet{}
 	err := r.Get(ctx, namespacedName, old)
 	if err != nil {
-		return nil, client.IgnoreNotFound(err)
+		return nil, err
 	}
 	sts, err := statefulset.NewEntity(old)
 	if err != nil {