Skip to content

Commit 348d438

Browse files
committed
we don't need to test the AWS API
1 parent 1e3e180 commit 348d438

File tree

1 file changed

+2
-15
lines changed

1 file changed

+2
-15
lines changed

test/e2e/suites/managed/eks_auth_test.go

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,6 @@ var _ = ginkgo.Describe("[managed] [auth] EKS authentication mode tests", func()
5555
clusterName = fmt.Sprintf("%s-%s", specName, util.RandomString(6))
5656
eksClusterName := getEKSClusterName(namespace.Name, clusterName)
5757

58-
ginkgo.By("default iam role should exist")
59-
VerifyRoleExistsAndOwned(ctx, ekscontrolplanev1.DefaultEKSControlPlaneRole, eksClusterName, false, e2eCtx.AWSSessionV2)
60-
6158
ginkgo.By("should create an EKS control plane with api_and_config_map authentication mode")
6259
ManagedClusterSpec(ctx, func() ManagedClusterSpecInput {
6360
return ManagedClusterSpecInput{
@@ -74,7 +71,7 @@ var _ = ginkgo.Describe("[managed] [auth] EKS authentication mode tests", func()
7471
}
7572
})
7673

77-
ginkgo.By("EKS cluster should be active and have correct authentication mode")
74+
ginkgo.By("EKS cluster should be active")
7875
verifyClusterActiveAndOwned(ctx, eksClusterName, e2eCtx.BootstrapUserAWSSessionV2)
7976

8077
ginkgo.By("verifying cluster has the correct authentication mode")
@@ -93,9 +90,6 @@ var _ = ginkgo.Describe("[managed] [auth] EKS authentication mode tests", func()
9390
err = e2eCtx.Environment.BootstrapClusterProxy.GetClient().Update(ctx, controlPlane)
9491
Expect(err).To(HaveOccurred(), "expected downgrade from api_and_config_map to config_map to fail")
9592

96-
ginkgo.By("verifying cluster still has api_and_config_map mode after failed downgrade")
97-
verifyClusterAuthenticationMode(ctx, eksClusterName, ekstypes.AuthenticationModeApiAndConfigMap, e2eCtx.BootstrapUserAWSSessionV2)
98-
9993
ginkgo.By("upgrading from api_and_config_map to api should succeed")
10094
err = e2eCtx.Environment.BootstrapClusterProxy.GetClient().Get(ctx, client.ObjectKey{
10195
Namespace: namespace.Name,
@@ -107,9 +101,6 @@ var _ = ginkgo.Describe("[managed] [auth] EKS authentication mode tests", func()
107101
err = e2eCtx.Environment.BootstrapClusterProxy.GetClient().Update(ctx, controlPlane)
108102
Expect(err).ToNot(HaveOccurred(), "expected upgrade from api_and_config_map to api to succeed")
109103

110-
ginkgo.By("verifying cluster now has api mode after successful upgrade")
111-
verifyClusterAuthenticationMode(ctx, eksClusterName, ekstypes.AuthenticationModeApi, e2eCtx.BootstrapUserAWSSessionV2)
112-
113104
ginkgo.By("attempting to downgrade from api to api_and_config_map should fail")
114105
err = e2eCtx.Environment.BootstrapClusterProxy.GetClient().Get(ctx, client.ObjectKey{
115106
Namespace: namespace.Name,
@@ -121,11 +112,7 @@ var _ = ginkgo.Describe("[managed] [auth] EKS authentication mode tests", func()
121112
err = e2eCtx.Environment.BootstrapClusterProxy.GetClient().Update(ctx, controlPlane)
122113
Expect(err).To(HaveOccurred(), "expected downgrade from api to api_and_config_map to fail")
123114

124-
ginkgo.By("verifying cluster still has api mode after failed downgrade")
125-
verifyClusterAuthenticationMode(ctx, eksClusterName, ekstypes.AuthenticationModeApi, e2eCtx.BootstrapUserAWSSessionV2)
126-
127-
ginkgo.By("Getting cluster for cleanup")
128-
cluster := framework.DiscoveryAndWaitForCluster(ctx, framework.DiscoveryAndWaitForClusterInput{
115+
cluster := framework.GetClusterByName(ctx, framework.GetClusterByNameInput{
129116
Getter: e2eCtx.Environment.BootstrapClusterProxy.GetClient(),
130117
Namespace: namespace.Name,
131118
Name: clusterName,

0 commit comments

Comments
 (0)