update test

apecloud · Apr 24, 2024 · 1eaa5b8 · 1eaa5b8
1 parent 9d355ee
commit 1eaa5b8
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/controllers/apps/cluster_plan_builder.go b/controllers/apps/cluster_plan_builder.go
@@ -284,8 +284,8 @@ func (c *clusterPlanBuilder) reconcileCluster(node *model.ObjectVertex) error {
 				return err
 			}
 		}
-	case model.CREATE:
-		return fmt.Errorf("cluster can't be created: %s", cluster.Name)
+	case model.CREATE, model.UPDATE:
+		return fmt.Errorf("cluster can't be created or updated: %s", cluster.Name)
 	}
 	return nil
 }

diff --git a/controllers/apps/transformer_cluster_placement.go b/controllers/apps/transformer_cluster_placement.go
@@ -61,9 +61,6 @@ func (t *clusterPlacementTransformer) Transform(ctx graph.TransformContext, dag
 	cluster.Annotations[constant.KBAppMultiClusterPlacementKey] = strings.Join(p, ",")
 	transCtx.Context = intoContext(transCtx.Context, placement(cluster))
 
-	graphCli, _ := transCtx.Client.(model.GraphClient)
-	graphCli.Update(dag, transCtx.OrigCluster, cluster)
-
 	return nil
 }
 

diff --git a/pkg/controller/component/vars_test.go b/pkg/controller/component/vars_test.go
@@ -821,7 +821,7 @@ var _ = Describe("vars", func() {
 			Expect(err).ShouldNot(BeNil())
 			Expect(err.Error()).Should(ContainSubstring("the required var is not found"))
 
-			By("adaptive - has load balancer service")
+			By("adaptive - has load balancer pod service")
 			vars = []appsv1alpha1.EnvVar{
 				{
 					Name: "advertised",
@@ -903,7 +903,9 @@ var _ = Describe("vars", func() {
 			Expect(err).Should(Succeed())
 			checkEnvVarWithValue(envVars, "advertised", advertisedSvcName)
 
-			By("adaptive - has load balancer in provisioning")
+			By("adaptive - has load balancer service in provisioning")
+			// change to non pod-service
+			advertisedSvcName = constant.GenerateComponentServiceName(synthesizedComp.ClusterName, synthesizedComp.Name, "advertised")
 			reader = &mockReader{
 				cli: testCtx.Cli,
 				objs: []client.Object{
@@ -961,10 +963,7 @@ var _ = Describe("vars", func() {
 			}
 			_, envVars, err = ResolveTemplateNEnvVars(testCtx.Ctx, reader, synthesizedComp, vars)
 			Expect(err).Should(Succeed())
-			endpoints = []string{
-				fmt.Sprintf("%s:127.0.0.1", advertisedSvcName),
-			}
-			checkEnvVarWithValue(envVars, "advertised", strings.Join(endpoints, ","))
+			checkEnvVarWithValue(envVars, "advertised", "127.0.0.1")
 		})
 
 		It("credential vars", func() {

diff --git a/pkg/controller/multicluster/placement.go b/pkg/controller/multicluster/placement.go
@@ -40,6 +40,8 @@ func FromContext(ctx context.Context) (string, error) {
 	return "", placementNotFoundError{}
 }
 
+// TODO: replace it with a new client option and automatically perform the assignment based on ordinal.
+
 func Assign(ctx context.Context, obj client.Object, ordinal func() int) client.Object {
 	// has been set
 	if obj.GetAnnotations() != nil && obj.GetAnnotations()[constant.KBAppMultiClusterPlacementKey] != "" {