feat: fix e2e

Signed-off-by: Ramesh Krishna <[email protected]>

Author: ramekris3163

test/e2e/clusteradm/init_test.go

@@ -34,47 +34,48 @@ var _ = ginkgo.Describe("test clusteradm with bootstrap token in singleton mode"
 			gomega.Expect(err).NotTo(gomega.HaveOccurred())
 			gomega.Expect(len(cm.Spec.RegistrationConfiguration.FeatureGates)).Should(gomega.Equal(1))
 
-			// TODO: E2e test is not recognizing the newly added flags. Uncomment below test once the problem is fixed.
-			//err = e2e.Clusteradm().Init(
-			//	"--use-bootstrap-token",
-			//	"--context", e2e.Cluster().Hub().Context(),
-			//	"--bundle-version=latest",
-			//	"--registration-auth awsirsa",
-			//	"--hub-cluster-arn arn:aws:eks:us-west-2:123456789012:cluster/hub-cluster1",
-			//)
-			//gomega.Expect(err).NotTo(gomega.HaveOccurred(), "clusteradm init error")
-			//
-			//cm, err = operatorClient.OperatorV1().ClusterManagers().Get(context.TODO(), "cluster-manager", metav1.GetOptions{})
-			//gomega.Expect(err).NotTo(gomega.HaveOccurred())
-			//// Ensure that when only awsirsa is passed as registration-auth only awsirsa driver is available
-			//gomega.Expect(len(cm.Spec.RegistrationConfiguration.RegistrationDrivers)).Should(gomega.Equal(1))
-			//gomega.Expect(cm.Spec.RegistrationConfiguration.RegistrationDrivers[0].AuthType).Should(gomega.Equal("awsirsa"))
-			//
-			//err = e2e.Clusteradm().Init(
-			//	"--use-bootstrap-token",
-			//	"--context", e2e.Cluster().Hub().Context(),
-			//	"--bundle-version=latest",
-			//	"--registration-auth awsirsa",
-			//	"--registration-auth csr",
-			//	"--hub-cluster-arn arn:aws:eks:us-west-2:123456789012:cluster/hub-cluster1",
-			//)
-			//gomega.Expect(err).NotTo(gomega.HaveOccurred(), "clusteradm init error")
-			//
-			//cm, err = operatorClient.OperatorV1().ClusterManagers().Get(context.TODO(), "cluster-manager", metav1.GetOptions{})
-			//gomega.Expect(err).NotTo(gomega.HaveOccurred())
-			//// Ensure that awsirsa and csr is passed as registration-auth both the values are set.
-			//gomega.Expect(len(cm.Spec.RegistrationConfiguration.RegistrationDrivers)).Should(gomega.Equal(2))
-			//gomega.Expect(cm.Spec.RegistrationConfiguration.RegistrationDrivers[0].AuthType).Should(gomega.Equal("csr"))
-			//gomega.Expect(cm.Spec.RegistrationConfiguration.RegistrationDrivers[1].AuthType).Should(gomega.Equal("awsirsa"))
-			//gomega.Expect(cm.Spec.RegistrationConfiguration.RegistrationDrivers[1].HubClusterArn).
-			//	Should(gomega.Equal("arn:aws:eks:us-west-2:123456789012:cluster/hub-cluster1"))
+			err = e2e.Clusteradm().Init(
+				"--use-bootstrap-token",
+				"--context", e2e.Cluster().Hub().Context(),
+				"--bundle-version=latest",
+				"--registration-auth=awsirsa",
+				"--hub-cluster-arn=arn:aws:eks:us-west-2:123456789012:cluster/hub-cluster1",
+			)
+			gomega.Expect(err).NotTo(gomega.HaveOccurred(), "clusteradm init error")
+
+			cm, err = operatorClient.OperatorV1().ClusterManagers().Get(context.TODO(), "cluster-manager", metav1.GetOptions{})
+			gomega.Expect(err).NotTo(gomega.HaveOccurred())
+			// Ensure that when only awsirsa is passed as registration-auth only awsirsa driver is available
+			gomega.Expect(len(cm.Spec.RegistrationConfiguration.RegistrationDrivers)).Should(gomega.Equal(1))
+			gomega.Expect(cm.Spec.RegistrationConfiguration.RegistrationDrivers[0].AuthType).Should(gomega.Equal("awsirsa"))
 
 			err = e2e.Clusteradm().Init(
 				"--use-bootstrap-token",
 				"--context", e2e.Cluster().Hub().Context(),
 				"--bundle-version=latest",
 				"--registration-auth=awsirsa",
 				"--registration-auth=csr",
+				"--hub-cluster-arn=arn:aws:eks:us-west-2:123456789012:cluster/hub-cluster1",
+			)
+			gomega.Expect(err).NotTo(gomega.HaveOccurred(), "clusteradm init error")
+
+			cm, err = operatorClient.OperatorV1().ClusterManagers().Get(context.TODO(), "cluster-manager", metav1.GetOptions{})
+			gomega.Expect(err).NotTo(gomega.HaveOccurred())
+			// Ensure that awsirsa and csr is passed as registration-auth both the values are set.
+			gomega.Expect(len(cm.Spec.RegistrationConfiguration.RegistrationDrivers)).Should(gomega.Equal(2))
+			gomega.Expect(cm.Spec.RegistrationConfiguration.RegistrationDrivers[0].AuthType).Should(gomega.Equal("csr"))
+			gomega.Expect(cm.Spec.RegistrationConfiguration.RegistrationDrivers[1].AuthType).Should(gomega.Equal("awsirsa"))
+			gomega.Expect(cm.Spec.RegistrationConfiguration.RegistrationDrivers[1].HubClusterArn).
+				Should(gomega.Equal("arn:aws:eks:us-west-2:123456789012:cluster/hub-cluster1"))
+
+			err = e2e.Clusteradm().Init(
+				"--use-bootstrap-token",
+				"--context", e2e.Cluster().Hub().Context(),
+				"--bundle-version=latest",
+				"--registration-auth=awsirsa",
+				"--registration-auth=csr",
+				"--hub-cluster-arn=arn:aws:eks:us-west-2:123456789012:cluster/hub-cluster1",
+				"--feature-gates=ManagedClusterAutoApproval=true",
 				"--auto-approved-csr-identities=csr1",
 				"--auto-approved-arn-patterns=arn:aws:eks:us-west-2:123456789012:cluster/*",
 			)