@@ -261,31 +261,6 @@ var _ = Describe("[Azure] [RKE2] Create and delete CAPI cluster from cluster cla
261261 })
262262})
263263
264- var _ = Describe ("[AWS] [EKS] Create and delete CAPI cluster functionality should work with namespace auto-import" , Label (e2e .FullTestLabel ), func () {
265- BeforeEach (func () {
266- komega .SetClient (bootstrapClusterProxy .GetClient ())
267- komega .SetContext (ctx )
268- })
269-
270- specs .CreateUsingGitOpsSpec (ctx , func () specs.CreateUsingGitOpsSpecInput {
271- return specs.CreateUsingGitOpsSpecInput {
272- E2EConfig : e2e .LoadE2EConfig (),
273- BootstrapClusterProxy : bootstrapClusterProxy ,
274- ClusterTemplate : e2e .CAPIAwsEKSMMP ,
275- ClusterName : "cluster-eks" ,
276- ControlPlaneMachineCount : ptr .To (1 ),
277- WorkerMachineCount : ptr .To (1 ),
278- LabelNamespace : true ,
279- RancherServerURL : hostName ,
280- CAPIClusterCreateWaitName : "wait-capa-create-cluster" ,
281- DeleteClusterWaitName : "wait-eks-delete" ,
282- CapiClusterOwnerLabel : e2e .CapiClusterOwnerLabel ,
283- CapiClusterOwnerNamespaceLabel : e2e .CapiClusterOwnerNamespaceLabel ,
284- OwnedLabelName : e2e .OwnedLabelName ,
285- }
286- })
287- })
288-
289264var _ = FDescribe ("[AWS] [EKS] Create and delete CAPI cluster from cluster class" , Label (e2e .FullTestLabel ), func () {
290265 var topologyNamespace string
291266
@@ -296,24 +271,8 @@ var _ = FDescribe("[AWS] [EKS] Create and delete CAPI cluster from cluster class
296271 topologyNamespace = "creategitops-aws-eks"
297272 })
298273
299- specs .CreateMgmtV3UsingGitOpsSpec (ctx , func () specs.CreateMgmtV3UsingGitOpsSpecInput {
300- testenv .CAPIOperatorDeployProvider (ctx , testenv.CAPIOperatorDeployProviderInput {
301- BootstrapClusterProxy : bootstrapClusterProxy ,
302- CAPIProvidersSecretsYAML : [][]byte {
303- e2e .AWSIdentitySecret ,
304- },
305- CAPIProvidersYAML : [][]byte {
306- e2e .AWSProvider ,
307- },
308- WaitForDeployments : []testenv.NamespaceName {
309- {
310- Name : "capa-controller-manager" ,
311- Namespace : "capa-system" ,
312- },
313- },
314- })
315-
316- return specs.CreateMgmtV3UsingGitOpsSpecInput {
274+ specs .CreateUsingGitOpsSpec (ctx , func () specs.CreateUsingGitOpsSpecInput {
275+ return specs.CreateUsingGitOpsSpecInput {
317276 E2EConfig : e2e .LoadE2EConfig (),
318277 BootstrapClusterProxy : bootstrapClusterProxy ,
319278 ClusterTemplate : e2e .CAPIAwsEKSTopology ,
@@ -337,7 +296,7 @@ var _ = FDescribe("[AWS] [EKS] Create and delete CAPI cluster from cluster class
337296 Paths : []string {"examples/clusterclasses/aws/eks" },
338297 ClusterProxy : bootstrapClusterProxy ,
339298 TargetNamespace : topologyNamespace ,
340- Branch : "aws-eks-example" , // TODO: Remove this before merging the PR
299+ Branch : "aws-eks-example" , //TODO: remove the branch and focus from test
341300 },
342301 },
343302 }
0 commit comments