Merge pull request #3713 from Skarlso/fix_checking_owner

Use the eksClusterName passed in to the function instead of the scope configured one

Author: k8s-ci-robot

pkg/cloud/services/eks/cluster.go

@@ -371,7 +371,7 @@ func (s *Service) createCluster(eksClusterName string) (*eks.Cluster, error) {
 	additionalTags := s.scope.AdditionalTags()
 
 	// Set the cloud provider tag
-	additionalTags[infrav1.ClusterAWSCloudProviderTagKey(s.scope.KubernetesClusterName())] = string(infrav1.ResourceLifecycleOwned)
+	additionalTags[infrav1.ClusterAWSCloudProviderTagKey(eksClusterName)] = string(infrav1.ResourceLifecycleOwned)
 	tags := make(map[string]*string)
 	for k, v := range additionalTags {
 		tagValue := v

pkg/cloud/services/eks/cluster_test.go

@@ -750,7 +750,7 @@ func TestCreateIPv6Cluster(t *testing.T) {
 			IpFamily: pointer.StringPtr("ipv6"),
 		},
 		Tags: map[string]*string{
-			"kubernetes.io/cluster/": pointer.StringPtr("owned"),
+			"kubernetes.io/cluster/cluster-name": pointer.StringPtr("owned"),
 		},
 	}).Return(&eks.CreateClusterOutput{}, nil)
 	iamMock.EXPECT().GetRole(&iam.GetRoleInput{

pkg/cloud/services/iamauth/reconcile.go

@@ -78,7 +78,7 @@ func (s *Service) ReconcileIAMAuthenticator(ctx context.Context) error {
 		}
 	}
 
-	s.scope.Info("Reconciled aws-iam-authenticator configuration", "cluster", klog.KRef("", s.scope.KubernetesClusterName()))
+	s.scope.Info("Reconciled aws-iam-authenticator configuration", "cluster", klog.KRef("", s.scope.Name()))
 
 	return nil
 }