Merge pull request #296 from Poor12/no-follower-when-dryrun

feat: do not follower scheduling when dry run
kubewharf · Dec 13, 2023 · 72fa461 · 72fa461
2 parents 4200c1b + ec4b269
commit 72fa461
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 80 deletions.
diff --git a/pkg/controllers/follower/controller.go b/pkg/controllers/follower/controller.go
@@ -353,7 +353,8 @@ func (c *Controller) inferFollowers(
 	sourceGK schema.GroupKind,
 	fedObj fedcorev1a1.GenericFederatedObject,
 ) (sets.Set[FollowerReference], error) {
-	if fedObj.GetAnnotations()[common.EnableFollowerSchedulingAnnotation] != common.AnnotationValueTrue {
+	if fedObj.GetAnnotations()[common.EnableFollowerSchedulingAnnotation] != common.AnnotationValueTrue ||
+		fedObj.GetAnnotations()[common.NoSchedulingAnnotation] == common.AnnotationValueTrue || skipSync(fedObj) {
 		// follower scheduling is not enabled
 		return nil, nil
 	}

diff --git a/pkg/controllers/follower/util.go b/pkg/controllers/follower/util.go
@@ -143,3 +143,12 @@ func getFollowersFromPod(
 
 	return followers
 }
+
+func skipSync(federatedObject fedcorev1a1.GenericFederatedObject) bool {
+	// if workloads have been propagated to member clusters,
+	// sync is always not skipped.
+	if len(federatedObject.GetStatus().Clusters) > 0 {
+		return false
+	}
+	return federatedObject.GetAnnotations()[common.DryRunAnnotation] == common.AnnotationValueTrue
+}
diff --git a/pkg/controllers/follower/util_test.go b/pkg/controllers/follower/util_test.go
@@ -21,8 +21,12 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/util/sets"
+
+	fedcorev1a1 "github.com/kubewharf/kubeadmiral/pkg/apis/core/v1alpha1"
+	"github.com/kubewharf/kubeadmiral/pkg/controllers/common"
 )
 
 func TestGetFollowersFromPod(t *testing.T) {
@@ -313,3 +317,21 @@ func TestGetFollowersFromPod(t *testing.T) {
 	assert := assert.New(t)
 	assert.Equal(expectedFollowers, followers)
 }
+
+func Test_skipSync(t *testing.T) {
+	federatedObject := &fedcorev1a1.FederatedObject{
+		ObjectMeta: metav1.ObjectMeta{
+			Annotations: map[string]string{common.DryRunAnnotation: common.AnnotationValueTrue},
+		},
+	}
+	assert.True(t, skipSync(federatedObject))
+	federatedObject.GetAnnotations()[common.DryRunAnnotation] = common.AnnotationValueFalse
+	assert.False(t, skipSync(federatedObject))
+	federatedObject.GetAnnotations()[common.DryRunAnnotation] = common.AnnotationValueTrue
+	federatedObject.GetStatus().Clusters = []fedcorev1a1.PropagationStatus{
+		{
+			Cluster: "cluster1",
+		},
+	}
+	assert.False(t, skipSync(federatedObject))
+}
diff --git a/pkg/controllers/sync/controller.go b/pkg/controllers/sync/controller.go
@@ -423,9 +423,12 @@ func (s *SyncController) reconcile(ctx context.Context, federatedName common.Qua
 		return worker.StatusError
 	}
 
-	if skipSync(fedResource.Object()) {
-		fedResource.RecordEvent("SyncSkipped", "Skip Syncing for %s", fedResource.FederatedName())
-		return worker.StatusAllOK
+	if fedResource.Object().GetAnnotations()[common.DryRunAnnotation] == common.AnnotationValueTrue {
+		if len(fedResource.Object().GetStatus().Clusters) == 0 {
+			fedResource.RecordEvent("DryRunWorked", "Dry run worked for %s", fedResource.FederatedName())
+			return worker.StatusAllOK
+		}
+		fedResource.RecordEvent("DryRunSkipped", "Dry run skipped because resource has been propagated")
 	}
 
 	clustersToSync, selectedClusters, err := s.prepareToSync(ctx, fedResource)

diff --git a/pkg/controllers/sync/util.go b/pkg/controllers/sync/util.go
diff --git a/pkg/controllers/sync/util_test.go b/pkg/controllers/sync/util_test.go