@@ -111,6 +111,17 @@ var _ = Describe("Test ApisixTls", func() {
111111 applier .MustApplyAPIv2 (types.NamespacedName {Namespace : s .Namespace (), Name : "test-route-tls" }, & apisixRoute , apisixRouteYamlTls )
112112 })
113113
114+ AfterEach (func () {
115+ By ("delete GatewayProxy" )
116+ gatewayProxy := fmt .Sprintf (gatewayProxyYamlTls , s .Deployer .GetAdminEndpoint (), s .AdminKey ())
117+ err := s .DeleteResourceFromStringWithNamespace (gatewayProxy , "default" )
118+ Expect (err ).ShouldNot (HaveOccurred (), "deleting GatewayProxy" )
119+
120+ By ("delete IngressClass" )
121+ err = s .DeleteResourceFromStringWithNamespace (ingressClassYamlTls , "" )
122+ Expect (err ).ShouldNot (HaveOccurred (), "deleting IngressClass" )
123+ })
124+
114125 It ("Basic ApisixTls test" , func () {
115126 const host = "api6.com"
116127
@@ -173,14 +184,6 @@ spec:
173184 WithHost ("api6.com" ).
174185 Expect ().
175186 Status (200 )
176-
177- By ("delete ApisixTls" )
178- err = s .DeleteResource ("ApisixTls" , "test-tls" )
179- Expect (err ).ShouldNot (HaveOccurred (), "deleting ApisixTls" )
180-
181- By ("delete TLS secret" )
182- err = s .DeleteResource ("Secret" , "test-tls-secret" )
183- Expect (err ).ShouldNot (HaveOccurred (), "deleting TLS secret" )
184187 })
185188
186189 It ("ApisixTls with mTLS test" , func () {
@@ -250,24 +253,7 @@ spec:
250253 assert .NotEmpty (GinkgoT (), tls [0 ].Client .CA , "client CA should not be empty" )
251254 assert .Equal (GinkgoT (), caCert , tls [0 ].Client .CA , "client CA should be test-ca-secret" )
252255 assert .Equal (GinkgoT (), int64 (1 ), * tls [0 ].Client .Depth , "client depth should be 1" )
253-
254- By ("delete ApisixTls" )
255- err = s .DeleteResource ("ApisixTls" , "test-mtls" )
256- Expect (err ).ShouldNot (HaveOccurred (), "deleting ApisixTls" )
257-
258- By ("delete TLS secret" )
259- err = s .DeleteResource ("Secret" , "test-mtls-secret" )
260- Expect (err ).ShouldNot (HaveOccurred (), "deleting TLS secret" )
261-
262- By ("delete CA secret" )
263- err = s .DeleteResource ("Secret" , "test-ca-secret" )
264- Expect (err ).ShouldNot (HaveOccurred (), "deleting CA secret" )
265256 })
266257
267- AfterEach (func () {
268- By ("delete GatewayProxy" )
269- err := s .DeleteResourceFromStringWithNamespace (fmt .Sprintf (gatewayProxyYamlTls , s .Deployer .GetAdminEndpoint (), s .AdminKey ()), "default" )
270- Expect (err ).ShouldNot (HaveOccurred (), "deleting GatewayProxy" )
271- })
272258 })
273259})
0 commit comments