Remove .metadata.clusterName usage

Winnie Kwon · Winnie Kwon · commit 3c03d59eeb2d · 2022-03-16T11:22:59.000-07:00
Upstream plans to drop ObjectMeta.ClusterName field as it has always been force cleared by the API server. See kubernetes/kubernetes#108717.
diff --git a/pkg/cloud/services/eks/addons.go b/pkg/cloud/services/eks/addons.go
@@ -196,7 +196,7 @@ func (s *Service) translateAPIToAddon(addons []ekscontrolplanev1.Addon) []*eksad
 		convertedAddon := &eksaddons.EKSAddon{
 			Name:                  &addon.Name,
 			Version:               &addon.Version,
-			Tags:                  ngTags(s.scope.Cluster.ClusterName, s.scope.AdditionalTags()),
+			Tags:                  ngTags(s.scope.Cluster.Name, s.scope.AdditionalTags()),
 			ResolveConflict:       convertConflictResolution(*addon.ConflictResolution),
 			ServiceAccountRoleARN: addon.ServiceAccountRoleArn,
 		}

Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ func (s Service) translateAPIToAddon(addons []ekscontrolplanev1.Addon) []eksad`
`196`	`196`	`convertedAddon := &eksaddons.EKSAddon{`
`197`	`197`	`Name: &addon.Name,`
`198`	`198`	`Version: &addon.Version,`
`199`		`- Tags: ngTags(s.scope.Cluster.ClusterName, s.scope.AdditionalTags()),`
	`199`	`+ Tags: ngTags(s.scope.Cluster.Name, s.scope.AdditionalTags()),`
`200`	`200`	`ResolveConflict: convertConflictResolution(*addon.ConflictResolution),`
`201`	`201`	`ServiceAccountRoleARN: addon.ServiceAccountRoleArn,`
`202`	`202`	`}`