Merge pull request #1341 from zhijianli88/cleanup

🌱: testing: Cleanup temporary files

Author: k8s-ci-robot

pkg/internal/testing/integration/internal/integration_tests/etcd_integration_test.go

@@ -57,6 +57,8 @@ var _ = Describe("Etcd", func() {
 		// it will timeout, as we'll never see the "startup message" we are waiting
 		// for on StdErr
 		Expect(etcd.Start()).To(MatchError(ContainSubstring("timeout")))
+		// Stop is required to cleanup the temporary directory
+		Expect(etcd.Stop()).To(Succeed())
 
 		Expect(stdout.String()).To(ContainSubstring("Member:"))
 		Expect(stderr.String()).To(ContainSubstring("Usage:"))

pkg/webhook/server_test.go

@@ -37,13 +37,14 @@ var _ = Describe("Webhook Server", func() {
 		testHostPort string
 		client       *http.Client
 		server       *webhook.Server
+		servingOpts  envtest.WebhookInstallOptions
 	)
 
 	BeforeEach(func() {
 		ctx, ctxCancel = context.WithCancel(context.Background())
 		// closed in indivual tests differently
 
-		servingOpts := envtest.WebhookInstallOptions{}
+		servingOpts = envtest.WebhookInstallOptions{}
 		Expect(servingOpts.PrepWithoutInstalling()).To(Succeed())
 
 		testHostPort = net.JoinHostPort(servingOpts.LocalServingHost, fmt.Sprintf("%d", servingOpts.LocalServingPort))
@@ -62,8 +63,9 @@ var _ = Describe("Webhook Server", func() {
 			Port:    servingOpts.LocalServingPort,
 			CertDir: servingOpts.LocalServingCertDir,
 		}
-
-		// TODO(directxman12): cleanup generated certificate dir, etc
+	})
+	AfterEach(func() {
+		Expect(servingOpts.Cleanup()).To(Succeed())
 	})
 
 	startServer := func() (done <-chan struct{}) {