Merge pull request #2928 from nojnhuh/tag-delete-1.6

[release-1.6] fix deleting all tags on AzureManagedControlPlane

Author: k8s-ci-robot

azure/services/managedclusters/spec.go

@@ -190,6 +190,7 @@ func (s *ManagedClusterSpec) Parameters(existing interface{}) (params interface{
 			Type: containerservice.ResourceIdentityTypeSystemAssigned,
 		},
 		Location: &s.Location,
+		Tags:     *to.StringMapPtr(s.Tags),
 		ManagedClusterProperties: &containerservice.ManagedClusterProperties{
 			NodeResourceGroup: &s.NodeResourceGroup,
 			EnableRBAC:        to.BoolPtr(true),
@@ -217,10 +218,6 @@ func (s *ManagedClusterSpec) Parameters(existing interface{}) (params interface{
 		},
 	}
 
-	if tags := *to.StringMapPtr(s.Tags); len(tags) != 0 {
-		managedCluster.Tags = tags
-	}
-
 	if s.PodCIDR != "" {
 		managedCluster.NetworkProfile.PodCidr = &s.PodCIDR
 	}
@@ -327,6 +324,12 @@ func (s *ManagedClusterSpec) Parameters(existing interface{}) (params interface{
 		// AgentPool changes are managed through AMMP.
 		managedCluster.AgentPoolProfiles = existingMC.AgentPoolProfiles
 
+		// Do not trigger an update because of nil/empty discrepancies between the two sets of tags.
+		if len(existingMC.Tags) == 0 && len(managedCluster.Tags) == 0 {
+			existingMC.Tags = nil
+			managedCluster.Tags = nil
+		}
+
 		diff := computeDiffOfNormalizedClusters(managedCluster, existingMC)
 		if diff == "" {
 			return nil, nil

azure/services/managedclusters/spec_test.go

@@ -128,6 +128,19 @@ func TestParameters(t *testing.T) {
 				g.Expect(result.(containerservice.ManagedCluster).KubernetesVersion).To(Equal(to.StringPtr("v1.22.99")))
 			},
 		},
+		{
+			name:     "delete all tags",
+			existing: getExistingCluster(),
+			spec: &ManagedClusterSpec{
+				Tags: nil,
+			},
+			expect: func(g *WithT, result interface{}) {
+				g.Expect(result).To(BeAssignableToTypeOf(containerservice.ManagedCluster{}))
+				tags := result.(containerservice.ManagedCluster).Tags
+				g.Expect(tags).NotTo(BeNil())
+				g.Expect(tags).To(BeEmpty())
+			},
+		},
 	}
 	for _, tc := range testcases {
 		tc := tc