DRY Docker test configuration strucutres - Reduce TestConfig fields, rename…

tests/docker/basics/basics_test.go

@@ -12,7 +12,7 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-var k3sImage = flag.String("k3sImage", "", "The k3s image used to provision containers")
+var k3sImage = flag.String("k3sImage", "", "The image used to provision containers")
 var config *tester.TestConfig
 
 func Test_DockerBasic(t *testing.T) {
@@ -27,7 +27,6 @@ var _ = Describe("Basic Tests", Ordered, func() {
 		It("should provision servers and agents", func() {
 			var err error
 			config, err = tester.NewTestConfig(*k3sImage)
-			config.NeedRestart = true
 			Expect(err).NotTo(HaveOccurred())
 			Expect(config.ProvisionServers(1)).To(Succeed())
 			Expect(config.ProvisionAgents(1)).To(Succeed())
@@ -35,18 +34,14 @@ var _ = Describe("Basic Tests", Ordered, func() {
 				return tester.DeploymentsReady([]string{"coredns", "local-path-provisioner", "metrics-server", "traefik"}, config.KubeconfigFile)
 			}, "60s", "5s").Should(Succeed())
 			Eventually(func() error {
-				return tester.NodesReady(config.KubeconfigFile)
+				return tester.NodesReady(config.KubeconfigFile, config.GetNodeNames())
 			}, "40s", "5s").Should(Succeed())
 		})
 	})
 
 	Context("Use Local Storage Volume", func() {
 		It("should apply local storage volume", func() {
-			const volumeTestManifest = "../resources/volume-test.yaml"
-
-			// Apply the manifest
-			cmd := fmt.Sprintf("kubectl apply -f %s --kubeconfig=%s", volumeTestManifest, config.KubeconfigFile)
-			_, err := tester.RunCommand(cmd)
+			_, err := config.DeployWorkload("volume-test.yaml")
 			Expect(err).NotTo(HaveOccurred(), "failed to apply volume test manifest")
 		})
 		It("should validate local storage volume", func() {

tests/docker/bootstraptoken/bootstraptoken_test.go

@@ -43,13 +43,13 @@ var _ = Describe("Boostrap Token Tests", Ordered, func() {
 		})
 		It("joins the agent with the new tokens", func() {
 			newSecret = strings.ReplaceAll(newSecret, "\n", "")
-			config.Secret = newSecret
+			config.Token = newSecret
 			Expect(config.ProvisionAgents(1)).To(Succeed())
 			Eventually(func(g Gomega) {
 				nodes, err := tester.ParseNodes(config.KubeconfigFile)
 				g.Expect(err).NotTo(HaveOccurred())
 				g.Expect(nodes).To(HaveLen(2))
-				g.Expect(tester.NodesReady(config.KubeconfigFile)).To(Succeed())
+				g.Expect(tester.NodesReady(config.KubeconfigFile, config.GetNodeNames())).To(Succeed())
 			}, "40s", "5s").Should(Succeed())
 		})
 	})

tests/docker/etcd/etcd_test.go

@@ -32,9 +32,8 @@ var _ = Describe("Etcd Tests", Ordered, func() {
 			Eventually(func() error {
 				return tester.DeploymentsReady([]string{"coredns", "local-path-provisioner", "metrics-server", "traefik"}, config.KubeconfigFile)
 			}, "60s", "5s").Should(Succeed())
-			Eventually(func(g Gomega) {
-				g.Expect(tester.ParseNodes(config.KubeconfigFile)).To(HaveLen(3))
-				g.Expect(tester.NodesReady(config.KubeconfigFile)).To(Succeed())
+			Eventually(func() error {
+				return tester.NodesReady(config.KubeconfigFile, config.GetNodeNames())
 			}, "60s", "5s").Should(Succeed())
 		})
 		It("should destroy the cluster", func() {
@@ -59,10 +58,9 @@ var _ = Describe("Etcd Tests", Ordered, func() {
 			Eventually(func() error {
 				return tester.DeploymentsReady([]string{"coredns", "local-path-provisioner", "metrics-server", "traefik"}, config.KubeconfigFile)
 			}, "90s", "5s").Should(Succeed())
-			Eventually(func(g Gomega) {
-				g.Expect(tester.ParseNodes(config.KubeconfigFile)).To(HaveLen(6))
-				g.Expect(tester.NodesReady(config.KubeconfigFile)).To(Succeed())
-			}, "60s", "5s").Should(Succeed())
+			Eventually(func() error {
+				return tester.NodesReady(config.KubeconfigFile, config.GetNodeNames())
+			}, "90s", "5s").Should(Succeed())
 		})
 	})
 })

tests/docker/lazypull/lazypull_test.go

@@ -33,18 +33,14 @@ var _ = Describe("LazyPull Tests", Ordered, func() {
 				return tester.DeploymentsReady([]string{"coredns", "local-path-provisioner", "metrics-server", "traefik"}, config.KubeconfigFile)
 			}, "60s", "5s").Should(Succeed())
 			Eventually(func() error {
-				return tester.NodesReady(config.KubeconfigFile)
+				return tester.NodesReady(config.KubeconfigFile, config.GetNodeNames())
 			}, "40s", "5s").Should(Succeed())
 		})
 	})
 
 	Context("Use Snapshot Container", func() {
 		It("should apply local storage volume", func() {
-			const snapshotTestManifest = "../resources/snapshot-test.yaml"
-
-			// Apply the manifest
-			cmd := fmt.Sprintf("kubectl apply -f %s --kubeconfig=%s", snapshotTestManifest, config.KubeconfigFile)
-			_, err := tester.RunCommand(cmd)
+			_, err := config.DeployWorkload("snapshot-test.yaml")
 			Expect(err).NotTo(HaveOccurred(), "failed to apply volume test manifest")
 		})
 		It("should have the pod come up", func() {

tests/docker/resources/clusterip.yaml

+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: test-clusterip
+spec:
+  selector:
+    matchLabels:
+      k8s-app: nginx-app-clusterip
+  replicas: 2
+  template:
+    metadata:
+      labels:
+        k8s-app: nginx-app-clusterip
+    spec:
+      containers:
+      - name: nginx
+        image: ranchertest/mytestcontainer
+        ports:
+        - containerPort: 80
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    k8s-app: nginx-app-clusterip
+  name: nginx-clusterip-svc
+  namespace: default
+spec:
+  type: ClusterIP
+  ports:
+    - port: 80
+  selector:
+    k8s-app: nginx-app-clusterip

tests/docker/resources/nodeport.yaml

+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: test-nodeport
+spec:
+  selector:
+    matchLabels:
+      k8s-app: nginx-app-nodeport
+  replicas: 2
+  template:
+    metadata:
+      labels:
+        k8s-app: nginx-app-nodeport
+    spec:
+      containers:
+      - name: nginx
+        image: ranchertest/mytestcontainer
+        ports:
+        - containerPort: 80
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    k8s-app: nginx-app-nodeport
+  name: nginx-nodeport-svc
+  namespace: default
+spec:
+  type: NodePort
+  ports:
+    - port: 80
+      nodePort: 30096
+      name: http
+  selector:
+    k8s-app: nginx-app-nodeport

tests/docker/skew/skew_test.go

@@ -18,9 +18,6 @@ var k3sImage = flag.String("k3sImage", "", "The current commit build of K3s")
 var branch = flag.String("branch", "master", "The release branch to test")
 var config *tester.TestConfig
 
-var numServers = 1
-var numAgents = 1
-
 func Test_DockerSkew(t *testing.T) {
 	flag.Parse()
 	RegisterFailHandler(Fail)
@@ -54,13 +51,13 @@ var _ = BeforeSuite(func() {
 var _ = Describe("Skew Tests", Ordered, func() {
 
 	Context("Setup Cluster with Server newer than Agent", func() {
-		It("should provision new servers and old agents", func() {
+		It("should provision new server and old agent", func() {
 			var err error
 			config, err = tester.NewTestConfig(*k3sImage)
 			Expect(err).NotTo(HaveOccurred())
-			Expect(config.ProvisionServers(numServers)).To(Succeed())
+			Expect(config.ProvisionServers(1)).To(Succeed())
 			config.K3sImage = "rancher/k3s:" + lastMinorVersion
-			Expect(config.ProvisionAgents(numAgents)).To(Succeed())
+			Expect(config.ProvisionAgents(1)).To(Succeed())
 			Eventually(func() error {
 				return tester.DeploymentsReady([]string{"coredns", "local-path-provisioner", "metrics-server", "traefik"}, config.KubeconfigFile)
 			}, "60s", "5s").Should(Succeed())
@@ -81,11 +78,7 @@ var _ = Describe("Skew Tests", Ordered, func() {
 			}
 		})
 		It("should deploy a test pod", func() {
-			const volumeTestManifest = "../resources/volume-test.yaml"
-
-			// Apply the manifest
-			cmd := fmt.Sprintf("kubectl apply -f %s --kubeconfig=%s", volumeTestManifest, config.KubeconfigFile)
-			_, err := tester.RunCommand(cmd)
+			_, err := config.DeployWorkload("volume-test.yaml")
 			Expect(err).NotTo(HaveOccurred(), "failed to apply volume test manifest")
 
 			Eventually(func() (bool, error) {
@@ -111,7 +104,7 @@ var _ = Describe("Skew Tests", Ordered, func() {
 			}, "60s", "5s").Should(Succeed())
 			Eventually(func(g Gomega) {
 				g.Expect(tester.ParseNodes(config.KubeconfigFile)).To(HaveLen(3))
-				g.Expect(tester.NodesReady(config.KubeconfigFile)).To(Succeed())
+				g.Expect(tester.NodesReady(config.KubeconfigFile, config.GetNodeNames())).To(Succeed())
 			}, "60s", "5s").Should(Succeed())
 		})
 		It("should match respective versions", func() {

tests/docker/upgrade/upgrade_test.go

@@ -60,15 +60,15 @@ var _ = Describe("Upgrade Tests", Ordered, func() {
 			testID := filepath.Base(config.TestDir)
 			Expect(err).NotTo(HaveOccurred())
 			for i := 0; i < numServers; i++ {
-				m1 := fmt.Sprintf("--mount type=volume,src=k3s-server-%d-%s-rancher,dst=/var/lib/rancher/k3s", i, testID)
-				m2 := fmt.Sprintf("--mount type=volume,src=k3s-server-%d-%s-log,dst=/var/log", i, testID)
-				m3 := fmt.Sprintf("--mount type=volume,src=k3s-server-%d-%s-etc,dst=/etc/rancher", i, testID)
+				m1 := fmt.Sprintf("--mount type=volume,src=server-%d-%s-rancher,dst=/var/lib/rancher/k3s", i, testID)
+				m2 := fmt.Sprintf("--mount type=volume,src=server-%d-%s-log,dst=/var/log", i, testID)
+				m3 := fmt.Sprintf("--mount type=volume,src=server-%d-%s-etc,dst=/etc/rancher", i, testID)
 				Expect(os.Setenv(fmt.Sprintf("SERVER_%d_DOCKER_ARGS", i), fmt.Sprintf("%s %s %s", m1, m2, m3))).To(Succeed())
 			}
 			for i := 0; i < numAgents; i++ {
-				m1 := fmt.Sprintf("--mount type=volume,src=k3s-agent-%d-%s-rancher,dst=/var/lib/rancher/k3s", i, testID)
-				m2 := fmt.Sprintf("--mount type=volume,src=k3s-agent-%d-%s-log,dst=/var/log", i, testID)
-				m3 := fmt.Sprintf("--mount type=volume,src=k3s-agent-%d-%s-etc,dst=/etc/rancher", i, testID)
+				m1 := fmt.Sprintf("--mount type=volume,src=agent-%d-%s-rancher,dst=/var/lib/rancher/k3s", i, testID)
+				m2 := fmt.Sprintf("--mount type=volume,src=agent-%d-%s-log,dst=/var/log", i, testID)
+				m3 := fmt.Sprintf("--mount type=volume,src=agent-%d-%s-etc,dst=/etc/rancher", i, testID)
 				Expect(os.Setenv(fmt.Sprintf("AGENT_%d_DOCKER_ARGS", i), fmt.Sprintf("%s %s %s", m1, m2, m3))).To(Succeed())
 			}
 		})
@@ -87,11 +87,7 @@ var _ = Describe("Upgrade Tests", Ordered, func() {
 			}
 		})
 		It("should deploy a test pod", func() {
-			const volumeTestManifest = "../resources/volume-test.yaml"
-
-			// Apply the manifest
-			cmd := fmt.Sprintf("kubectl apply -f %s --kubeconfig=%s", volumeTestManifest, config.KubeconfigFile)
-			_, err := tester.RunCommand(cmd)
+			_, err := config.DeployWorkload("volume-test.yaml")
 			Expect(err).NotTo(HaveOccurred(), "failed to apply volume test manifest")
 
 			Eventually(func() (bool, error) {