Merge pull request #593 from gianlucam76/sharding-annotation

(chore) move ShardingAnnotation

Author: gianlucam76

api/v1beta1/sveltoscluster_type.go

@@ -24,6 +24,10 @@ const (
 	SveltosClusterKind = "SveltosCluster"
 )
 
+const (
+	ShardAnnotation = "sharding.projectsveltos.io/key"
+)
+
 type ActiveWindow struct {
 	// From in Cron format, see https://en.wikipedia.org/wiki/Cron.
 	// Indicates when to un-pause the cluster (cluster in paused state receives no update from sveltos).

lib/clusterproxy/cluster_utils_test.go

@@ -33,7 +33,6 @@ import (
 	libsveltosv1beta1 "github.com/projectsveltos/libsveltos/api/v1beta1"
 	"github.com/projectsveltos/libsveltos/internal/test/helpers/external"
 	"github.com/projectsveltos/libsveltos/lib/clusterproxy"
-	"github.com/projectsveltos/libsveltos/lib/sharding"
 )
 
 var _ = Describe("Cluster utils", func() {
@@ -229,8 +228,8 @@ var _ = Describe("Cluster utils", func() {
 				Namespace: randomString(),
 				Name:      randomString(),
 				Annotations: map[string]string{
-					sharding.ShardAnnotation: shardKey,
-					onboardAnnotation:        randomString(),
+					libsveltosv1beta1.ShardAnnotation: shardKey,
+					onboardAnnotation:                 randomString(),
 				},
 			},
 		}
@@ -240,7 +239,7 @@ var _ = Describe("Cluster utils", func() {
 				Namespace: randomString(),
 				Name:      randomString(),
 				Annotations: map[string]string{
-					sharding.ShardAnnotation: randomString(),
+					libsveltosv1beta1.ShardAnnotation: randomString(),
 				},
 			},
 		}

lib/predicates/clusters_test.go

@@ -26,7 +26,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/event"
 
 	"github.com/projectsveltos/libsveltos/lib/predicates"
-	"github.com/projectsveltos/libsveltos/lib/sharding"
 
 	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
 
@@ -170,7 +169,7 @@ var _ = Describe("ClusterProfile Predicates: SvelotsClusterPredicates", func() {
 	It("Update reprocesses when sveltos Cluster annotation change", func() {
 		clusterPredicate := predicates.SveltosClusterPredicates(logger)
 
-		cluster.Annotations = map[string]string{sharding.ShardAnnotation: "shard1"}
+		cluster.Annotations = map[string]string{libsveltosv1beta1.ShardAnnotation: "shard1"}
 
 		oldCluster := &libsveltosv1beta1.SveltosCluster{
 			ObjectMeta: metav1.ObjectMeta{
@@ -329,7 +328,7 @@ var _ = Describe("ClusterProfile Predicates: ClusterPredicates", func() {
 	It("Update reprocesses when v1Cluster annotation change", func() {
 		clusterPredicate := predicates.ClusterPredicate{Logger: logger}
 
-		cluster.Labels = map[string]string{sharding.ShardAnnotation: "shard-production"}
+		cluster.Labels = map[string]string{libsveltosv1beta1.ShardAnnotation: "shard-production"}
 
 		oldCluster := &clusterv1.Cluster{
 			ObjectMeta: metav1.ObjectMeta{

lib/sharding/utils.go

@@ -39,10 +39,6 @@ import (
 // A cluster with no shardAnnotation will only be managed by
 // the deployment started with no shard-key arg.
 
-const (
-	ShardAnnotation = "sharding.projectsveltos.io/key"
-)
-
 // IsShardAMatch returns true if a cluster is a shard match.
 func IsShardAMatch(shardKey string, cluster client.Object) bool {
 	annotations := cluster.GetAnnotations()
@@ -52,7 +48,7 @@ func IsShardAMatch(shardKey string, cluster client.Object) bool {
 		return shardKey == ""
 	}
 
-	v, ok := annotations[ShardAnnotation]
+	v, ok := annotations[libsveltosv1beta1.ShardAnnotation]
 	if !ok {
 		// A cluster with no ShardAnnotation is only managed by
 		// deployment started with no shard-key arg.

lib/sharding/utils_test.go

@@ -81,7 +81,7 @@ var _ = Describe("Sharding", func() {
 
 		Expect(sharding.IsShardAMatch(shard, cluster)).To(BeFalse())
 
-		cluster.Annotations[sharding.ShardAnnotation] = randomString()
+		cluster.Annotations[libsveltosv1beta1.ShardAnnotation] = randomString()
 		Expect(sharding.IsShardAMatch(shard, cluster)).To(BeFalse())
 	})
 
@@ -93,7 +93,7 @@ var _ = Describe("Sharding", func() {
 				Namespace: randomString(),
 				Name:      randomString(),
 				Annotations: map[string]string{
-					sharding.ShardAnnotation: shard,
+					libsveltosv1beta1.ShardAnnotation: shard,
 				},
 			},
 		}