Merge pull request #161 from kilosonc/feat/metatag

fix: tags disappear when updating cluster
horizoncd · May 24, 2023 · 09f8392 · 09f8392
2 parents 17edf24 + 9884c03
commit 09f8392
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/core/controller/cluster/controller_basic.go b/core/controller/cluster/controller_basic.go
@@ -702,7 +702,7 @@ func (c *controller) UpdateCluster(ctx context.Context, clusterID uint,
 	if err != nil {
 		return nil, err
 	}
-	if !tagmodels.Tags(tags).Eq(tagsInDB) {
+	if r.Tags != nil && !tagmodels.Tags(tags).Eq(tagsInDB) {
 		if err := c.clusterGitRepo.UpdateTags(ctx, application.Name, cluster.Name, cluster.Template, tags); err != nil {
 			return nil, err
 		}

diff --git a/core/controller/cluster/controller_basic_v2.go b/core/controller/cluster/controller_basic_v2.go
@@ -512,7 +512,7 @@ func (c *controller) UpdateClusterV2(ctx context.Context, clusterID uint,
 	if err != nil {
 		return err
 	}
-	if !tagmodels.Tags(tags).Eq(tagsInDB) {
+	if r.Tags != nil && !tagmodels.Tags(tags).Eq(tagsInDB) {
 		if err := c.clusterGitRepo.UpdateTags(ctx, application.Name, cluster.Name, cluster.Template, tags); err != nil {
 			return err
 		}