Move Function Rotate Certificate to Utils file

Signed-off-by: est-suse <esteban.esquivel@suse.com>
k3s-io · Apr 5, 2023 · e1e98bc · e1e98bc
1 parent b3eaef9
commit e1e98bc
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 145 deletions.
diff --git a/tests/e2e/certrotation/certrotation_test.go b/tests/e2e/certrotation/certrotation_test.go
diff --git a/tests/e2e/rotatecertificate/rotatecertificate.go b/tests/e2e/rotatecertificate/rotatecertificate.go
diff --git a/tests/e2e/rotatecertificate/rotatecertificate_test.go b/tests/e2e/rotatecertificate/rotatecertificate_test.go
@@ -75,7 +75,7 @@ var _ = Describe("Verify Custom CA Rotation", Ordered, func() {
 			var finalErr error
 			errStop := e2e.StopCluster(serverNodeNames)
 			Expect(errStop).NotTo(HaveOccurred(), "Server not stop correctly")
-			errRotate := rotateCertificate(serverNodeNames)
+			errRotate := e2e.RotateCertificate(serverNodeNames)
 			Expect(errRotate).NotTo(HaveOccurred(), "Certificate not rotate correctly")
 			errStart := e2e.StartCluster(serverNodeNames)
 			Expect(errStart).NotTo(HaveOccurred(), "Server not start correctly")

diff --git a/tests/e2e/certrotation/vagrantfile → tests/e2e/rotatecertificate/vagrantfile b/tests/e2e/certrotation/vagrantfile → tests/e2e/rotatecertificate/vagrantfile
diff --git a/tests/e2e/testutils.go b/tests/e2e/testutils.go
@@ -446,6 +446,17 @@ func StopCluster(nodeNames []string) error {
 	return nil
 }
 
+// rotateCertificate rotate the Certificate on each node given
+func RotateCertificate(nodeNames []string) error {
+	for _, nodeName := range nodeNames {
+		cmd := "sudo k3s --debug certificate rotate"
+		if _, err := RunCmdOnNode(cmd, nodeName); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
 // RunCmdOnNode executes a command from within the given node
 func RunCmdOnNode(cmd string, nodename string) (string, error) {
 	runcmd := "vagrant ssh -c \"" + cmd + "\" " + nodename