Replace e2e.ParseNodes function with general ParseNodes and NodesRead…

…y test functions

Signed-off-by: Derek Nola <[email protected]>

tests/e2e/btrfs/btrfs_test.go

@@ -45,12 +45,8 @@ var _ = Describe("Verify that btrfs based servers work", Ordered, func() {
 
 		It("Checks node and pod status", func() {
 			By("Fetching Nodes status")
-			Eventually(func(g Gomega) {
-				nodes, err := e2e.ParseNodes(tc.KubeconfigFile, false)
-				g.Expect(err).NotTo(HaveOccurred())
-				for _, node := range nodes {
-					g.Expect(node.Status).Should(Equal("Ready"))
-				}
+			Eventually(func() error {
+				return tests.NodesReady(tc.KubeconfigFile, e2e.VagrantSlice(tc.AllNodes()))
 			}, "620s", "5s").Should(Succeed())
 			e2e.DumpPods(tc.KubeconfigFile)
 

tests/e2e/dualstack/dualstack_test.go

@@ -49,15 +49,10 @@ var _ = Describe("Verify DualStack Configuration", Ordered, func() {
 		})
 
 		It("Checks Node Status", func() {
-			Eventually(func(g Gomega) {
-				nodes, err := e2e.ParseNodes(tc.KubeconfigFile, false)
-				g.Expect(err).NotTo(HaveOccurred())
-				for _, node := range nodes {
-					g.Expect(node.Status).Should(Equal("Ready"))
-				}
+			Eventually(func() error {
+				return tests.NodesReady(tc.KubeconfigFile, e2e.VagrantSlice(tc.AllNodes()))
 			}, "620s", "5s").Should(Succeed())
-			_, err := e2e.ParseNodes(tc.KubeconfigFile, true)
-			Expect(err).NotTo(HaveOccurred())
+			e2e.DumpNodes(tc.KubeconfigFile)
 		})
 
 		It("Checks pod status", func() {

tests/e2e/embeddedmirror/embeddedmirror_test.go

@@ -53,12 +53,8 @@ var _ = Describe("Verify Create", Ordered, func() {
 		})
 		It("Checks node and pod status", func() {
 			By("Fetching Nodes status")
-			Eventually(func(g Gomega) {
-				nodes, err := e2e.ParseNodes(tc.KubeconfigFile, false)
-				g.Expect(err).NotTo(HaveOccurred())
-				for _, node := range nodes {
-					g.Expect(node.Status).Should(Equal("Ready"))
-				}
+			Eventually(func() error {
+				return tests.NodesReady(tc.KubeconfigFile, e2e.VagrantSlice(tc.AllNodes()))
 			}, "620s", "5s").Should(Succeed())
 
 			By("Fetching pod status")

tests/e2e/externalip/externalip_test.go

@@ -74,15 +74,10 @@ var _ = Describe("Verify External-IP config", Ordered, func() {
 		})
 
 		It("Checks Node Status", func() {
-			Eventually(func(g Gomega) {
-				nodes, err := e2e.ParseNodes(tc.KubeconfigFile, false)
-				g.Expect(err).NotTo(HaveOccurred())
-				for _, node := range nodes {
-					g.Expect(node.Status).Should(Equal("Ready"))
-				}
+			Eventually(func() error {
+				return tests.NodesReady(tc.KubeconfigFile, e2e.VagrantSlice(tc.AllNodes()))
 			}, "620s", "5s").Should(Succeed())
-			_, err := e2e.ParseNodes(tc.KubeconfigFile, true)
-			Expect(err).NotTo(HaveOccurred())
+			e2e.DumpNodes(tc.KubeconfigFile)
 		})
 
 		It("Checks pod status", func() {

tests/e2e/privateregistry/privateregistry_test.go

@@ -55,12 +55,8 @@ var _ = Describe("Verify Create", Ordered, func() {
 		})
 		It("Checks node and pod status", func() {
 			By("Fetching Nodes status")
-			Eventually(func(g Gomega) {
-				nodes, err := e2e.ParseNodes(tc.KubeconfigFile, false)
-				g.Expect(err).NotTo(HaveOccurred())
-				for _, node := range nodes {
-					g.Expect(node.Status).Should(Equal("Ready"))
-				}
+			Eventually(func() error {
+				return tests.NodesReady(tc.KubeconfigFile, e2e.VagrantSlice(tc.AllNodes()))
 			}, "620s", "5s").Should(Succeed())
 			e2e.DumpPods(tc.KubeconfigFile)
 

tests/e2e/rootless/rootless_test.go

@@ -101,14 +101,10 @@ var _ = Describe("Various Startup Configurations", Ordered, func() {
 
 		It("Checks node and pod status", func() {
 			By("Fetching Nodes status")
-			Eventually(func(g Gomega) {
-				nodes, err := e2e.ParseNodes(tc.KubeconfigFile, false)
-				g.Expect(err).NotTo(HaveOccurred())
-				for _, node := range nodes {
-					g.Expect(node.Status).Should(Equal("Ready"))
-				}
+			Eventually(func() error {
+				return tests.NodesReady(tc.KubeconfigFile, e2e.VagrantSlice(tc.AllNodes()))
 			}, "360s", "5s").Should(Succeed())
-			_, _ = e2e.ParseNodes(tc.KubeconfigFile, false)
+			e2e.DumpNodes(tc.KubeconfigFile)
 
 			Eventually(func() error {
 				return tests.AllPodsUp(tc.KubeconfigFile)

tests/e2e/rotateca/rotateca_test.go

@@ -50,14 +50,10 @@ var _ = Describe("Verify Custom CA Rotation", Ordered, func() {
 
 		It("Checks node and pod status", func() {
 			By("Fetching Nodes status")
-			Eventually(func(g Gomega) {
-				nodes, err := e2e.ParseNodes(tc.KubeconfigFile, false)
-				g.Expect(err).NotTo(HaveOccurred())
-				for _, node := range nodes {
-					g.Expect(node.Status).Should(Equal("Ready"))
-				}
+			Eventually(func() error {
+				return tests.NodesReady(tc.KubeconfigFile, e2e.VagrantSlice(tc.AllNodes()))
 			}, "620s", "5s").Should(Succeed())
-			e2e.ParseNodes(tc.KubeconfigFile, true)
+			e2e.DumpNodes(tc.KubeconfigFile)
 
 			Eventually(func() error {
 				return tests.AllPodsUp(tc.KubeconfigFile)
@@ -92,13 +88,9 @@ var _ = Describe("Verify Custom CA Rotation", Ordered, func() {
 		})
 
 		It("Checks node and pod status", func() {
-			Eventually(func(g Gomega) {
-				nodes, err := e2e.ParseNodes(tc.KubeconfigFile, false)
-				g.Expect(err).NotTo(HaveOccurred())
-				for _, node := range nodes {
-					g.Expect(node.Status).Should(Equal("Ready"))
-				}
-			}, "420s", "5s").Should(Succeed())
+			Eventually(func() error {
+				return tests.NodesReady(tc.KubeconfigFile, e2e.VagrantSlice(tc.AllNodes()))
+			}, "360s", "5s").Should(Succeed())
 
 			Eventually(func() error {
 				return tests.AllPodsUp(tc.KubeconfigFile)

tests/e2e/s3/s3_test.go

@@ -52,14 +52,10 @@ var _ = Describe("Verify Create", Ordered, func() {
 		})
 		It("Checks node and pod status", func() {
 			By("Fetching Nodes status")
-			Eventually(func(g Gomega) {
-				nodes, err := e2e.ParseNodes(tc.KubeconfigFile, false)
-				g.Expect(err).NotTo(HaveOccurred())
-				for _, node := range nodes {
-					g.Expect(node.Status).Should(Equal("Ready"))
-				}
+			Eventually(func() error {
+				return tests.NodesReady(tc.KubeconfigFile, e2e.VagrantSlice(tc.AllNodes()))
 			}, "620s", "5s").Should(Succeed())
-			e2e.ParseNodes(tc.KubeconfigFile, true)
+			e2e.DumpNodes(tc.KubeconfigFile)
 
 			Eventually(func() error {
 				return tests.AllPodsUp(tc.KubeconfigFile)

tests/e2e/secretsencryption/secretsencryption_test.go

@@ -54,14 +54,10 @@ var _ = Describe("Verify Secrets Encryption Rotation", Ordered, func() {
 
 		It("Checks node and pod status", func() {
 			By("Fetching Nodes status")
-			Eventually(func(g Gomega) {
-				nodes, err := e2e.ParseNodes(tc.KubeconfigFile, false)
-				g.Expect(err).NotTo(HaveOccurred())
-				for _, node := range nodes {
-					g.Expect(node.Status).Should(Equal("Ready"))
-				}
+			Eventually(func() error {
+				return tests.NodesReady(tc.KubeconfigFile, e2e.VagrantSlice(tc.AllNodes()))
 			}, "620s", "5s").Should(Succeed())
-			e2e.ParseNodes(tc.KubeconfigFile, true)
+			e2e.DumpNodes(tc.KubeconfigFile)
 
 			Eventually(func() error {
 				return tests.AllPodsUp(tc.KubeconfigFile)

tests/e2e/secretsencryption_old/secretsencryption_test.go

@@ -51,12 +51,8 @@ var _ = Describe("Verify Secrets Encryption Rotation", Ordered, func() {
 
 		It("Checks node and pod status", func() {
 			By("Fetching Nodes status")
-			Eventually(func(g Gomega) {
-				nodes, err := e2e.ParseNodes(tc.KubeconfigFile, false)
-				g.Expect(err).NotTo(HaveOccurred())
-				for _, node := range nodes {
-					g.Expect(node.Status).Should(Equal("Ready"))
-				}
+			Eventually(func() error {
+				return tests.NodesReady(tc.KubeconfigFile, e2e.VagrantSlice(tc.AllNodes()))
 			}, "620s", "5s").Should(Succeed())
 
 			Eventually(func() error {
@@ -103,13 +99,9 @@ var _ = Describe("Verify Secrets Encryption Rotation", Ordered, func() {
 		})
 
 		It("Checks node and pod status", func() {
-			Eventually(func(g Gomega) {
-				nodes, err := e2e.ParseNodes(tc.KubeconfigFile, false)
-				g.Expect(err).NotTo(HaveOccurred())
-				for _, node := range nodes {
-					g.Expect(node.Status).Should(Equal("Ready"))
-				}
-			}, "420s", "5s").Should(Succeed())
+			Eventually(func() error {
+				return tests.NodesReady(tc.KubeconfigFile, e2e.VagrantSlice(tc.AllNodes()))
+			}, "360s", "5s").Should(Succeed())
 
 			Eventually(func() error {
 				return tests.AllPodsUp(tc.KubeconfigFile)

tests/e2e/splitserver/splitserver_test.go

@@ -126,6 +126,7 @@ var (
 	etcdNodes  []e2e.VagrantNode
 	cpNodes    []e2e.VagrantNode
 	agentNodes []e2e.VagrantNode
+	allNodes   []e2e.VagrantNode
 )
 
 var _ = ReportAfterEach(e2e.GenReport)
@@ -150,13 +151,11 @@ var _ = Describe("Verify Create", Ordered, func() {
 		})
 
 		It("Checks node and pod status", func() {
+			allNodes = append(cpNodes, etcdNodes...)
+			allNodes = append(allNodes, agentNodes...)
 			By("Fetching Nodes status")
-			Eventually(func(g Gomega) {
-				nodes, err := e2e.ParseNodes(tc.KubeconfigFile, false)
-				g.Expect(err).NotTo(HaveOccurred())
-				for _, node := range nodes {
-					g.Expect(node.Status).Should(Equal("Ready"))
-				}
+			Eventually(func() error {
+				return tests.NodesReady(tc.KubeconfigFile, e2e.VagrantSlice(allNodes))
 			}, "620s", "5s").Should(Succeed())
 
 			Eventually(func() error {
@@ -248,7 +247,7 @@ var _ = Describe("Verify Create", Ordered, func() {
 			Eventually(func(g Gomega) {
 				count, err := e2e.GetDaemonsetReady("test-daemonset", tc.KubeconfigFile)
 				g.Expect(err).NotTo(HaveOccurred())
-				g.Expect(cpNodes).To(HaveLen(count), "Daemonset pod count does not match cp node count")
+				g.Expect(cpNodes).To(HaveLen(count), "Daemonset pod count does not match node count")
 			}, "240s", "10s").Should(Succeed())
 		})
 
@@ -275,8 +274,6 @@ var _ = AfterEach(func() {
 })
 
 var _ = AfterSuite(func() {
-	allNodes := append(cpNodes, etcdNodes...)
-	allNodes = append(allNodes, agentNodes...)
 	if failed {
 		AddReportEntry("journald-logs", e2e.TailJournalLogs(1000, allNodes))
 	} else {

tests/e2e/startup/startup_test.go

@@ -117,12 +117,8 @@ var _ = Describe("Various Startup Configurations", Ordered, func() {
 
 		It("Checks node and pod status", func() {
 			By("Fetching node status")
-			Eventually(func(g Gomega) {
-				nodes, err := e2e.ParseNodes(tc.KubeconfigFile, false)
-				g.Expect(err).NotTo(HaveOccurred())
-				for _, node := range nodes {
-					g.Expect(node.Status).Should(Equal("Ready"))
-				}
+			Eventually(func() error {
+				return tests.NodesReady(tc.KubeconfigFile, e2e.VagrantSlice(tc.AllNodes()))
 			}, "360s", "5s").Should(Succeed())
 			Eventually(func() error {
 				return tests.AllPodsUp(tc.KubeconfigFile)
@@ -186,12 +182,8 @@ var _ = Describe("Various Startup Configurations", Ordered, func() {
 
 		It("Checks node and pod status", func() {
 			By("Fetching node status")
-			Eventually(func(g Gomega) {
-				nodes, err := e2e.ParseNodes(tc.KubeconfigFile, false)
-				g.Expect(err).NotTo(HaveOccurred())
-				for _, node := range nodes {
-					g.Expect(node.Status).Should(Equal("Ready"))
-				}
+			Eventually(func() error {
+				return tests.NodesReady(tc.KubeconfigFile, e2e.VagrantSlice(tc.AllNodes()))
 			}, "360s", "5s").Should(Succeed())
 			Eventually(func() error {
 				return tests.AllPodsUp(tc.KubeconfigFile)
@@ -229,12 +221,8 @@ var _ = Describe("Various Startup Configurations", Ordered, func() {
 
 		It("Checks node and pod status", func() {
 			By("Fetching node status")
-			Eventually(func(g Gomega) {
-				nodes, err := e2e.ParseNodes(tc.KubeconfigFile, false)
-				g.Expect(err).NotTo(HaveOccurred())
-				for _, node := range nodes {
-					g.Expect(node.Status).Should(Equal("Ready"))
-				}
+			Eventually(func() error {
+				return tests.NodesReady(tc.KubeconfigFile, e2e.VagrantSlice(tc.AllNodes()))
 			}, "360s", "5s").Should(Succeed())
 
 			Eventually(func() error {
@@ -265,12 +253,8 @@ var _ = Describe("Various Startup Configurations", Ordered, func() {
 
 		It("Checks node and pod status", func() {
 			By("Fetching node status")
-			Eventually(func(g Gomega) {
-				nodes, err := e2e.ParseNodes(tc.KubeconfigFile, false)
-				g.Expect(err).NotTo(HaveOccurred())
-				for _, node := range nodes {
-					g.Expect(node.Status).Should(Equal("Ready"))
-				}
+			Eventually(func() error {
+				return tests.NodesReady(tc.KubeconfigFile, e2e.VagrantSlice(tc.AllNodes()))
 			}, "360s", "5s").Should(Succeed())
 
 			Eventually(func() error {
@@ -301,12 +285,8 @@ var _ = Describe("Various Startup Configurations", Ordered, func() {
 
 		It("Checks node and pod status", func() {
 			By("Fetching node status")
-			Eventually(func(g Gomega) {
-				nodes, err := e2e.ParseNodes(tc.KubeconfigFile, false)
-				g.Expect(err).NotTo(HaveOccurred())
-				for _, node := range nodes {
-					g.Expect(node.Status).Should(Equal("Ready"))
-				}
+			Eventually(func() error {
+				return tests.NodesReady(tc.KubeconfigFile, e2e.VagrantSlice(tc.Agents))
 			}, "360s", "5s").Should(Succeed())
 
 			Eventually(func() error {

tests/e2e/svcpoliciesandfirewall/svcpoliciesandfirewall_test.go

@@ -57,16 +57,10 @@ var _ = Describe("Verify Services Traffic policies and firewall config", Ordered
 		})
 
 		It("Checks Node Status", func() {
-			Eventually(func(g Gomega) {
-				var err error
-				nodes, err = e2e.ParseNodes(tc.KubeconfigFile, false)
-				g.Expect(err).NotTo(HaveOccurred())
-				for _, node := range nodes {
-					g.Expect(node.Status).Should(Equal("Ready"))
-				}
-			}, "300s", "5s").Should(Succeed())
-			_, err := e2e.ParseNodes(tc.KubeconfigFile, true)
-			Expect(err).NotTo(HaveOccurred())
+			Eventually(func() error {
+				return tests.NodesReady(tc.KubeconfigFile, e2e.VagrantSlice(tc.AllNodes()))
+			}, "360s", "5s").Should(Succeed())
+			e2e.DumpNodes(tc.KubeconfigFile)
 		})
 
 		It("Checks Pod Status", func() {

tests/e2e/tailscale/tailscale_test.go

@@ -6,6 +6,7 @@ import (
 	"os"
 	"testing"
 
+	"github.com/k3s-io/k3s/tests"
 	"github.com/k3s-io/k3s/tests/e2e"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
@@ -46,16 +47,11 @@ var _ = Describe("Verify Tailscale Configuration", Ordered, func() {
 	})
 
 	// Server node needs to be ready before we continue
-	It("Checks Node Status", func() {
-		Eventually(func(g Gomega) {
-			nodes, err := e2e.ParseNodes(tc.KubeconfigFile, false)
-			g.Expect(err).NotTo(HaveOccurred())
-			for _, node := range nodes {
-				g.Expect(node.Status).Should(Equal("Ready"))
-			}
-		}, "300s", "5s").Should(Succeed())
-		_, err := e2e.ParseNodes(tc.KubeconfigFile, true)
-		Expect(err).NotTo(HaveOccurred())
+	It("Checks Server Status", func() {
+		Eventually(func() error {
+			return tests.NodesReady(tc.KubeconfigFile, e2e.VagrantSlice(tc.Servers))
+		}, "360s", "5s").Should(Succeed())
+		e2e.DumpNodes(tc.KubeconfigFile)
 	})
 
 	It("Change agent's config", func() {
@@ -73,16 +69,10 @@ var _ = Describe("Verify Tailscale Configuration", Ordered, func() {
 	})
 
 	It("Checks Node Status", func() {
-		Eventually(func(g Gomega) {
-			nodes, err := e2e.ParseNodes(tc.KubeconfigFile, false)
-			g.Expect(err).NotTo(HaveOccurred())
-			g.Expect(len(nodes)).To(Equal(*agentCount + *serverCount))
-			for _, node := range nodes {
-				g.Expect(node.Status).Should(Equal("Ready"))
-			}
-		}, "300s", "5s").Should(Succeed())
-		_, err := e2e.ParseNodes(tc.KubeconfigFile, true)
-		Expect(err).NotTo(HaveOccurred())
+		Eventually(func() error {
+			return tests.NodesReady(tc.KubeconfigFile, e2e.VagrantSlice(tc.AllNodes()))
+		}, "360s", "5s").Should(Succeed())
+		e2e.DumpNodes(tc.KubeconfigFile)
 	})
 
 	It("Verifies that server and agent have a tailscale IP as nodeIP", func() {