Fix caceertrotation test; add kine to matrix

Signed-off-by: Brad Davidson <[email protected]>

Author: brandond

.gitignore

@@ -29,6 +29,7 @@ __pycache__
 /tests/.pytest_cache/
 /tests/.tox/
 /tests/.vscode
+/tests/**/*log.txt
 /sonobuoy-output
 *.tmp
 config/local.tfvars

tests/integration/cacertrotation/cacertrotation_int_test.go

@@ -4,36 +4,35 @@ import (
 	"fmt"
 	"strings"
 	"testing"
+	"time"
 
 	tests "github.com/k3s-io/k3s/tests"
 	testutil "github.com/k3s-io/k3s/tests/integration"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 
-const tmpdDataDir = "/tmp/cacertrotationtest"
+var _ = DescribeTableSubtree("ca certificate rotation", Ordered, func(serverArgs []string) {
+	var server, server2 *testutil.K3sServer
+	var tmpdDataDir, certHash, caCertHash string
+	var testLock int
+	var failed bool
 
-var server, server2 *testutil.K3sServer
-var serverArgs = []string{"--cluster-init", "-t", "test", "-d", tmpdDataDir}
-var certHash, caCertHash string
-var testLock int
-
-var _ = BeforeSuite(func() {
-	if !testutil.IsExistingServer() {
-		var err error
-		testLock, err = testutil.K3sTestLock()
-		Expect(err).ToNot(HaveOccurred())
-		server, err = testutil.K3sStartServer(serverArgs...)
-		Expect(err).ToNot(HaveOccurred())
-	}
-})
-
-var _ = Describe("ca certificate rotation", Ordered, func() {
-	BeforeEach(func() {
+	BeforeAll(func() {
 		if testutil.IsExistingServer() && !testutil.ServerArgsPresent(serverArgs) {
 			Skip("Test needs k3s server with: " + strings.Join(serverArgs, " "))
+		} else {
+			var err error
+			testLock, err = testutil.K3sTestLock()
+			Expect(err).ToNot(HaveOccurred())
+
+			tmpdDataDir = GinkgoT().TempDir()
+			serverArgs = append(serverArgs, tmpdDataDir)
+			server, err = testutil.K3sStartServer(serverArgs...)
+			Expect(err).ToNot(HaveOccurred())
 		}
 	})
+
 	When("a new server is created", func() {
 		It("starts up with no problems", func() {
 			Eventually(func() error {
@@ -59,6 +58,7 @@ var _ = Describe("ca certificate rotation", Ordered, func() {
 			res, err := testutil.K3sCmd("certificate", "rotate-ca", "-d", tmpdDataDir, "--path", tmpdDataDir+"/server/rotate-ca")
 			By("checking command results: " + res)
 			Expect(err).ToNot(HaveOccurred())
+			time.Sleep(5 * time.Second)
 		})
 		It("stop k3s", func() {
 			Expect(testutil.K3sKillServer(server)).To(Succeed())
@@ -84,24 +84,26 @@ var _ = Describe("ca certificate rotation", Ordered, func() {
 			Expect(caCertHash).To(Not(Equal(caCertHashAfter)))
 		})
 	})
-})
 
-var failed bool
-var _ = AfterEach(func() {
-	failed = failed || CurrentSpecReport().Failed()
-})
+	AfterAll(func() {
+		failed = failed || CurrentSpecReport().Failed()
+	})
 
-var _ = AfterSuite(func() {
-	if !testutil.IsExistingServer() {
-		if failed {
-			testutil.K3sSaveLog(server, false)
+	AfterAll(func() {
+		if !testutil.IsExistingServer() {
+			if failed {
+				testutil.K3sSaveLog(server, false)
+			}
+			Expect(testutil.K3sKillServer(server)).To(Succeed())
+			Expect(testutil.K3sCleanup(-1, "")).To(Succeed())
+			Expect(testutil.K3sKillServer(server2)).To(Succeed())
+			Expect(testutil.K3sCleanup(testLock, tmpdDataDir)).To(Succeed())
 		}
-		Expect(testutil.K3sKillServer(server)).To(Succeed())
-		Expect(testutil.K3sCleanup(-1, "")).To(Succeed())
-		Expect(testutil.K3sKillServer(server2)).To(Succeed())
-		Expect(testutil.K3sCleanup(testLock, tmpdDataDir)).To(Succeed())
-	}
-})
+	})
+},
+	Entry("with kine", []string{"-t", "test", "-d"}),
+	Entry("with etcd", []string{"--cluster-init", "-t", "test", "-d"}),
+)
 
 func Test_IntegrationCertRotation(t *testing.T) {
 	RegisterFailHandler(Fail)

tests/integration/integration.go

@@ -200,7 +200,7 @@ func K3sStartServer(inputArgs ...string) (*K3sServer, error) {
 	}
 	cmd.Stdout = f
 	cmd.Stderr = f
-	logrus.Infof("Starting k3s server with stdout and stderr written to %s", logpath)
+	logrus.Infof("Running %q with stdout and stderr written to %s", cmd, logpath)
 	err = cmd.Start()
 	return &K3sServer{cmd, f}, err
 }