Skip to content

Commit 249b741

Browse files
committed
Remove EKS cluster template and related test
Signed-off-by: Parthvi Vala <[email protected]>
1 parent 33324d7 commit 249b741

File tree

4 files changed

+4
-125
lines changed

4 files changed

+4
-125
lines changed

test/e2e/const.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,6 @@ var (
8787
//go:embed data/cluster-templates/docker-rke2-topology.yaml
8888
CAPIDockerRKE2Topology []byte
8989

90-
//go:embed data/cluster-templates/aws-eks-mmp.yaml
91-
CAPIAwsEKSMMP []byte
92-
9390
//go:embed data/cluster-templates/aws-eks-topology.yaml
9491
CAPIAwsEKSTopology []byte
9592

test/e2e/data/cluster-templates/aws-eks-mmp.yaml

Lines changed: 0 additions & 77 deletions
This file was deleted.

test/e2e/specs/import_gitops.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ func CreateUsingGitOpsSpec(ctx context.Context, inputGetter func() CreateUsingGi
278278
Eventually(
279279
komega.Get(capiCluster),
280280
input.E2EConfig.GetIntervals(input.BootstrapClusterProxy.GetName(), "wait-rancher")...).
281-
Should(Succeed(), "Failed to apply CAPI cluster definition to cluster via Fleet")
281+
Should(Succeed(), fmt.Sprintf("Failed to apply CAPI cluster definition to cluster %s/%s via Fleet", namespace.Name, input.ClusterName))
282282

283283
By("Waiting for the CAPI cluster to be connectable")
284284
Eventually(func() error {

test/e2e/suites/import-gitops/import_gitops_test.go

Lines changed: 3 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -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-
289264
var _ = 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

Comments
 (0)