Skip to content

test(e2e): cleanup kind cluster #563

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
github-actions merged 1 commit into from
Jan 21, 2026
Merged

test(e2e): cleanup kind cluster #563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 17 additions & 11 deletions test/e2e/e2e_suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ import (
)

const (
// kindClusterName is the name of the Kind cluster created for e2e tests.
kindClusterName = "e2e-tests"
// defaultReadyTimeout is the default timeout for a resource to report a ready state.
defaultReadyTimeout = 3 * time.Minute
// defaultInterval is the default interval to check if a resource exists or ready conditions.
Expand Down Expand Up @@ -108,8 +110,18 @@ var _ = ginkgo.BeforeSuite(func() {
})

var _ = ginkgo.AfterSuite(func() {
if k8sContext != "" {
// Used an existing Kubernetes context
if k8sContext == "" {
// delete kind cluster we created
ginkgo.By("Deleting kind cluster " + kindClusterName)
command := exec.Command("kind", "delete", "cluster", "--name", kindClusterName)
session, err := gexec.Start(command, ginkgo.GinkgoWriter, ginkgo.GinkgoWriter)
if err != nil {
ginkgo.GinkgoLogr.Error(err, "Failed to delete kind cluster")
} else {
gomega.Eventually(session).WithTimeout(60 * time.Second).Should(gexec.Exit())
}
} else {
// Used an existing Kubernetes context, clean up created resources
// Stop port-forward
if portForwardSession != nil {
portForwardSession.Terminate()
Expand All @@ -129,18 +141,12 @@ var _ = ginkgo.AfterSuite(func() {
err := testConfig.KubeCli.CoreV1().Namespaces().Delete(testConfig.Context, nsName, metav1.DeleteOptions{})
gomega.Expect(err).ShouldNot(gomega.HaveOccurred())
}
return
}

command := exec.Command("kind", "delete", "cluster", "--name", "e2e-tests")
session, err := gexec.Start(command, ginkgo.GinkgoWriter, ginkgo.GinkgoWriter)
gomega.Expect(err).ShouldNot(gomega.HaveOccurred())
gomega.Eventually(session).WithTimeout(600 * time.Second).Should(gexec.Exit(0))
})

// Create the Kubernetes cluster for the E2E tests and load the local images
func setupK8sCluster() {
command := exec.Command("kind", "create", "cluster", "--name", "e2e-tests", "--config", "-")
command := exec.Command("kind", "create", "cluster", "--name", kindClusterName, "--config", "-")
stdin, err := command.StdinPipe()
gomega.Expect(err).ShouldNot(gomega.HaveOccurred())
go func() {
Expand All @@ -165,7 +171,7 @@ func kindLoadImage(image string) {
tempDir := ginkgo.GinkgoT().TempDir()
target := tempDir + "/container.tar"

ginkgo.By(fmt.Sprintf("Loading %s into the cluster e2e-tests using %s", image, containerRuntime))
ginkgo.By(fmt.Sprintf("Loading %s into the cluster %s using %s", image, kindClusterName, containerRuntime))

_, err := exec.LookPath(containerRuntime)
gomega.Expect(err).ShouldNot(gomega.HaveOccurred(), "Could not find %s in PATH", containerRuntime)
Expand All @@ -182,7 +188,7 @@ func kindLoadImage(image string) {
gomega.Expect(err).ShouldNot(gomega.HaveOccurred())
gomega.Eventually(session).WithTimeout(600 * time.Second).Should(gexec.Exit(0))

command = exec.Command("kind", "--name", "e2e-tests", "load", "image-archive", target)
command = exec.Command("kind", "--name", kindClusterName, "load", "image-archive", target)
session, err = gexec.Start(command, ginkgo.GinkgoWriter, ginkgo.GinkgoWriter)
gomega.Expect(err).ShouldNot(gomega.HaveOccurred())
gomega.Eventually(session).WithTimeout(600 * time.Second).Should(gexec.Exit(0))
Expand Down
12 changes: 12 additions & 0 deletions test/scripts/run_e2e.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
#!/bin/bash

set -euo pipefail

cleanup() {
echo "Interrupted! Cleaning up kind cluster..."
kind delete cluster --name e2e-tests 2>/dev/null || true
exit 130 # SIGINT (Ctrl+C)
}

# Set trap only for interruption signals
# Normally kind cluster cleanup is done by AfterSuite
trap cleanup INT TERM

echo "Running end to end tests"

DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
Expand Down