Addressing review comments

Signed-off-by: Gaurav Jaswal <[email protected]>

manifests/cluster-manager/hub/cluster-manager-registration-serviceaccount.yaml

@@ -6,4 +6,7 @@ metadata:
   {{ if .ManagedClusterIdentityCreatorRole }}
   annotations:
     eks.amazonaws.com/role-arn: {{ .ManagedClusterIdentityCreatorRole }}
-  {{end}}
+  {{ else }}
+  annotations:
+    eks.amazonaws.com/role-arn-: ""
+  {{end}}

pkg/common/helpers/parser.go → pkg/common/helpers/aws.go

@@ -2,13 +2,19 @@ package helpers
 
 import "strings"
 
+// GetAwsAccountIdAndClusterName Parses aws accountId and cluster-name from clusterArn
+// e.g. if clusterArn is arn:aws:eks:us-west-2:123456789012:cluster/hub-cluster1
+// accountId is 123456789012 and clusterName is hub-cluster1
 func GetAwsAccountIdAndClusterName(clusterArn string) (string, string) {
 	clusterStringParts := strings.Split(clusterArn, ":")
 	clusterName := strings.Split(clusterStringParts[5], "/")[1]
 	awsAccountId := clusterStringParts[4]
 	return awsAccountId, clusterName
 }
 
+// GetAwsRegion Parses aws accountId and cluster-name from clusterArn
+// e.g. if clusterArn is arn:aws:eks:us-west-2:123456789012:cluster/hub-cluster1
+// awsRegion is us-west-2
 func GetAwsRegion(clusterArn string) string {
 	clusterStringParts := strings.Split(clusterArn, ":")
 	return clusterStringParts[3]

test/integration/operator/clustermanager_aws_test.go

@@ -55,6 +55,15 @@ var _ = ginkgo.Describe("ClusterManager Default Mode with aws registration", fun
 					return false
 				}
 				annotation := registrationControllerSA.Annotations["eks.amazonaws.com/role-arn"]
+
+				// The same cluster-manager CR is used for other tests.
+				// Hence updating it here, so that annotation is removed for other test testing with csr or empty registration
+				clusterManager, err := operatorClient.OperatorV1().ClusterManagers().Get(context.Background(), clusterManagerName, metav1.GetOptions{})
+				gomega.Expect(err).ToNot(gomega.HaveOccurred())
+				clusterManager.Spec.RegistrationConfiguration = nil
+				_, err = operatorClient.OperatorV1().ClusterManagers().Update(context.Background(), clusterManager, metav1.UpdateOptions{})
+				gomega.Expect(err).ToNot(gomega.HaveOccurred())
+
 				return annotation == "arn:aws:iam::123456789012:role/hub-cluster_managed-cluster-identity-creator"
 			}, eventuallyTimeout, eventuallyInterval).Should(gomega.BeTrue())