From 035956499869e63cdd8c443c812db58a5e4135be Mon Sep 17 00:00:00 2001 From: Vitor Savian Date: Thu, 28 Sep 2023 13:28:14 -0300 Subject: [PATCH] Added cluster reset from non bootstrap nodes on snapshot e2e test Signed-off-by: Vitor Savian --- tests/e2e/snapshotrestore/Vagrantfile | 2 -- tests/e2e/snapshotrestore/snapshotrestore_test.go | 13 +++++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/tests/e2e/snapshotrestore/Vagrantfile b/tests/e2e/snapshotrestore/Vagrantfile index 6f802d250a..20927d1a93 100644 --- a/tests/e2e/snapshotrestore/Vagrantfile +++ b/tests/e2e/snapshotrestore/Vagrantfile @@ -26,8 +26,6 @@ def provision(vm, role, role_num, node_num) install_type = getInstallType(vm, RELEASE_VERSION, GITHUB_BRANCH) vm.provision "shell", inline: "ping -c 2 k3s.io" - - db_type = getDBType(role, role_num, vm) if role.include?("server") && role_num == 0 vm.provision 'k3s-primary-server', type: 'k3s', run: 'once' do |k3s| diff --git a/tests/e2e/snapshotrestore/snapshotrestore_test.go b/tests/e2e/snapshotrestore/snapshotrestore_test.go index 4bdccc8874..3904e37e54 100644 --- a/tests/e2e/snapshotrestore/snapshotrestore_test.go +++ b/tests/e2e/snapshotrestore/snapshotrestore_test.go @@ -123,6 +123,7 @@ var _ = Describe("Verify snapshots and cluster restores work", Ordered, func() { }) }) + Context("Cluster is reset normally", func() { It("Resets the cluster", func() { for _, nodeName := range serverNodeNames { @@ -143,6 +144,17 @@ var _ = Describe("Verify snapshots and cluster restores work", Ordered, func() { Expect(e2e.RunCmdOnNode(cmd, serverNodeNames[0])).Error().NotTo(HaveOccurred()) }) + It("Resets non boostrap nodes", func() { + for _, nodeName := range serverNodeNames { + if nodeName != serverNodeNames[0] { + cmd := "k3s server --cluster-reset" + response, err := e2e.RunCmdOnNode(cmd, nodeName) + Expect(err).NotTo(HaveOccurred()) + Expect(response).Should(ContainSubstring("Managed etcd cluster membership has been reset, restart without --cluster-reset flag now")) + } + } + }) + It("Checks that other servers are not ready", func() { fmt.Printf("\nFetching node status\n") Eventually(func(g Gomega) { @@ -208,6 +220,7 @@ var _ = Describe("Verify snapshots and cluster restores work", Ordered, func() { }) }) + Context("Cluster restores from snapshot", func() { It("Restores the snapshot", func() { //Stop k3s on all nodes