feat: update nstemplateset revisions status (codeready-toolchain#648)

* update nstemplateset revisions status

Author: mfrancisc

controllers/nstemplateset/features.go

@@ -2,9 +2,9 @@ package nstemplateset
 
 import (
 	toolchainv1alpha1 "github.com/codeready-toolchain/api/api/v1alpha1"
+	"github.com/codeready-toolchain/toolchain-common/pkg/utils"
 	"k8s.io/utils/strings/slices"
 	runtimeclient "sigs.k8s.io/controller-runtime/pkg/client"
-	"strings"
 )
 
 // shouldCreate checks if the object has a feature toggle annotation. If it does then check if the corresponding
@@ -22,15 +22,5 @@ func shouldCreate(toCreate runtimeclient.Object, nsTmplSet *toolchainv1alpha1.NS
 	if !found {
 		return false // No feature winners in the NSTemplateSet at all. Skip this object.
 	}
-	return slices.Contains(splitCommaSeparatedList(winners), feature)
-}
-
-// splitCommaSeparatedList acts exactly the same as strings.Split(s, ",") but returns an empty slice for empty strings.
-// To be used when, for example, we want to get an empty slice for empty comma separated list:
-// strings.Split("", ",") returns [""] while splitCommaSeparatedList("") returns []
-func splitCommaSeparatedList(s string) []string {
-	if len(s) == 0 {
-		return []string{}
-	}
-	return strings.Split(s, ",")
+	return slices.Contains(utils.SplitCommaSeparatedList(winners), feature)
 }

controllers/nstemplateset/features_test.go

@@ -1,10 +1,10 @@
 package nstemplateset
 
 import (
-	runtimeclient "sigs.k8s.io/controller-runtime/pkg/client"
-	"strings"
 	"testing"
 
+	runtimeclient "sigs.k8s.io/controller-runtime/pkg/client"
+
 	toolchainv1alpha1 "github.com/codeready-toolchain/api/api/v1alpha1"
 	"github.com/stretchr/testify/assert"
 )
@@ -98,12 +98,6 @@ func TestShouldCreate(t *testing.T) {
 	}
 }
 
-func TestReallySplit(t *testing.T) {
-	assert.Empty(t, splitCommaSeparatedList(""))
-	assert.Equal(t, strings.Split("1,2,3", ","), splitCommaSeparatedList("1,2,3"))
-	assert.Equal(t, strings.Split("1", ","), splitCommaSeparatedList("1"))
-}
-
 func p(s string) *string {
 	return &s
 }

controllers/nstemplateset/nstemplateset_controller.go

@@ -136,12 +136,18 @@ func (r *Reconciler) Reconcile(ctx context.Context, request ctrl.Request) (ctrl.
 	} else if createdOrUpdated {
 		return reconcile.Result{}, nil // wait for cluster resources to be created
 	}
+	if err := r.status.updateStatusClusterResourcesRevisions(ctx, nsTmplSet); err != nil {
+		return reconcile.Result{}, err
+	}
 
 	if createdOrUpdated, err := r.namespaces.ensure(ctx, nsTmplSet); err != nil {
 		logger.Error(err, "failed to either provision or update user namespaces")
 		return reconcile.Result{}, err
 	} else if createdOrUpdated {
-		return reconcile.Result{}, nil // something in the watched resources has changed - wait for another reconcile
+		return reconcile.Result{}, nil
+	}
+	if err := r.status.updateStatusNamespacesRevisions(ctx, nsTmplSet); err != nil {
+		return reconcile.Result{}, err
 	}
 
 	// update provisioned namespace list
@@ -154,7 +160,10 @@ func (r *Reconciler) Reconcile(ctx context.Context, request ctrl.Request) (ctrl.
 		logger.Error(err, "failed to either provision or update roles in space")
 		return reconcile.Result{}, err
 	} else if createdOrUpdated {
-		return reconcile.Result{}, nil // something in the watched resources has changed - wait for another reconcile
+		return reconcile.Result{}, nil
+	}
+	if err := r.status.updateStatusSpaceRolesRevisions(ctx, nsTmplSet); err != nil {
+		return reconcile.Result{}, err
 	}
 
 	return reconcile.Result{}, r.status.setStatusReady(ctx, nsTmplSet)