Organized tests and removed unnecessary ones

Author: alexbrand

integration/add_worker_test.go

@@ -11,18 +11,17 @@ var _ = Describe("kismatic install add-worker tests", func() {
 	BeforeEach(func() {
 		os.Chdir(kisPath)
 	})
-	Context("Targeting AWS infrastructure", func() {
-		Context("Using Ubuntu 16.04 LTS", func() {
-			ItOnAWS("should successfully add a new worker", func(provisioner infrastructureProvisioner) {
-				WithInfrastructure(NodeCount{Worker: 2}, Ubuntu1604LTS, provisioner, func(nodes provisionedNodes, sshKey string) {
-					theNode := nodes.worker[0]
-					err := installKismaticMini(theNode, sshKey)
-					Expect(err).ToNot(HaveOccurred())
 
-					newWorker := nodes.worker[1]
-					err = addWorkerToKismaticMini(newWorker)
-					Expect(err).ToNot(HaveOccurred())
-				})
+	Describe("adding a worker to an existing cluster", func() {
+		ItOnAWS("should result in a cluster with an additional worker", func(aws infrastructureProvisioner) {
+			WithInfrastructure(NodeCount{Worker: 2}, CentOS7, aws, func(nodes provisionedNodes, sshKey string) {
+				theNode := nodes.worker[0]
+				err := installKismaticMini(theNode, sshKey)
+				Expect(err).ToNot(HaveOccurred())
+
+				newWorker := nodes.worker[1]
+				err = addWorkerToKismaticMini(newWorker)
+				Expect(err).ToNot(HaveOccurred())
 			})
 		})
 	})

integration/disconnected_install_test.go

@@ -0,0 +1,66 @@
+package integration
+
+import (
+	"fmt"
+	"os"
+	"time"
+
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+)
+
+var _ = Describe("disconnected install feature", func() {
+	BeforeEach(func() {
+		os.Chdir(kisPath)
+	})
+
+	Describe("Installing on machines with no internet access", func() {
+		Context("with kismatic packages installed", func() {
+			ItOnAWS("should install successfully", func(aws infrastructureProvisioner) {
+				WithMiniInfrastructure(CentOS7, aws, func(node NodeDeets, sshKey string) {
+					By("Installing the RPMs on the node")
+					theNode := []NodeDeets{node}
+					nodes := provisionedNodes{
+						etcd:    theNode,
+						master:  theNode,
+						worker:  theNode,
+						ingress: theNode,
+					}
+					InstallKismaticPackages(nodes, CentOS7, sshKey)
+
+					By("Verifying connectivity to google.com")
+					err := runViaSSH([]string{"curl --head www.google.com"}, theNode, sshKey, 1*time.Minute)
+					FailIfError(err, "Failed to curl google")
+
+					By("Blocking all outbound connections")
+					allowPorts := "8888,2379,6666,2380,6660,6443,8443,80,443" // ports needed/checked by inspector
+					cmd := []string{
+						"sudo iptables -A OUTPUT -o lo -j ACCEPT",                                                         // allow loopback
+						"sudo iptables -A OUTPUT -p tcp --sport 22 -m state --state ESTABLISHED -j ACCEPT",                // allow SSH
+						fmt.Sprintf("sudo iptables -A OUTPUT -p tcp --match multiport --sports %s -j ACCEPT", allowPorts), // allow inspector
+						"sudo iptables -A OUTPUT -s 172.16.0.0/16 -j ACCEPT",
+						"sudo iptables -A OUTPUT -d 172.16.0.0/16 -j ACCEPT", // Allow pod network
+						"sudo iptables -P OUTPUT DROP",                       // drop everything else
+					}
+					err = runViaSSH(cmd, theNode, sshKey, 1*time.Minute)
+					FailIfError(err, "Failed to create iptable rule")
+
+					By("Verifying that connections are blocked")
+					err = runViaSSH([]string{"curl --max-time 5 www.google.com"}, theNode, sshKey, 1*time.Minute)
+					if err == nil {
+						Fail("was able to ping google with outgoing connections blocked")
+					}
+
+					By("Running kismatic install apply")
+					installOpts := installOptions{
+						allowPackageInstallation:    false,
+						modifyHostsFiles:            true,
+						autoConfigureDockerRegistry: true,
+					}
+					err = installKismatic(nodes, installOpts, sshKey)
+					Expect(err).ToNot(HaveOccurred())
+				})
+			})
+		})
+	})
+})

integration/docker_registry_test.go

@@ -0,0 +1,46 @@
+package integration
+
+import (
+	"os"
+
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+)
+
+var _ = Describe("kismatic docker registry feature", func() {
+	BeforeEach(func() {
+		os.Chdir(kisPath)
+	})
+
+	Describe("enabling the internal docker registry feature", func() {
+		ItOnAWS("should install successfully", func(aws infrastructureProvisioner) {
+			WithInfrastructure(NodeCount{1, 1, 1, 0, 0}, CentOS7, aws, func(nodes provisionedNodes, sshKey string) {
+				opts := installOptions{
+					allowPackageInstallation:    true,
+					autoConfigureDockerRegistry: true,
+				}
+				err := installKismatic(nodes, opts, sshKey)
+				Expect(err).ToNot(HaveOccurred())
+			})
+		})
+	})
+
+	Describe("using an existing private docker registry", func() {
+		ItOnAWS("should install successfully", func(aws infrastructureProvisioner) {
+			WithInfrastructure(NodeCount{1, 1, 1, 0, 0}, CentOS7, aws, func(nodes provisionedNodes, sshKey string) {
+				By("Installing an external Docker registry on one of the nodes")
+				dockerRegistryPort := 8443
+				caFile, err := deployDockerRegistry(nodes.etcd[0], dockerRegistryPort, sshKey)
+				Expect(err).ToNot(HaveOccurred())
+				installOpts := installOptions{
+					allowPackageInstallation: true,
+					dockerRegistryCAPath:     caFile,
+					dockerRegistryIP:         nodes.etcd[0].PrivateIP,
+					dockerRegistryPort:       dockerRegistryPort,
+				}
+				err = installKismatic(nodes, installOpts, sshKey)
+				Expect(err).ToNot(HaveOccurred())
+			})
+		})
+	})
+})

integration/framework.go

@@ -7,23 +7,27 @@ import (
 
 // ItOnAWS runs a spec if the AWS details have been provided
 func ItOnAWS(description string, f func(infrastructureProvisioner)) {
-	It(description, func() {
-		awsClient, ok := AWSClientFromEnvironment()
-		if !ok {
-			Skip("AWS environment variables were not defined")
-		}
-		f(awsClient)
+	Context("When using AWS infrastructure [aws]", func() {
+		It(description, func() {
+			awsClient, ok := AWSClientFromEnvironment()
+			if !ok {
+				Skip("AWS environment variables were not defined")
+			}
+			f(awsClient)
+		})
 	})
 }
 
 // ItOnPacket runs a spec if the Packet.Net details have been provided
 func ItOnPacket(description string, f func(infrastructureProvisioner)) {
-	It(description, func() {
-		packetClient, ok := packetClientFromEnv()
-		if !ok {
-			Skip("Packet environment variables were not defined")
-		}
-		f(packetClient)
+	Context("When using Packet.net infrastructure [packet]", func() {
+		It(description, func() {
+			packetClient, ok := packetClientFromEnv()
+			if !ok {
+				Skip("Packet environment variables were not defined")
+			}
+			f(packetClient)
+		})
 	})
 }
 

integration/glide.lock

@@ -0,0 +1,47 @@
+package integration
+
+import (
+	"os"
+
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+)
+
+var _ = Describe("hosts file modification feature", func() {
+	BeforeEach(func() {
+		os.Chdir(kisPath)
+	})
+
+	Describe("enabling the hosts file modification feature", func() {
+		ItOnAWS("should result in a functional cluster", func(aws infrastructureProvisioner) {
+			WithInfrastructure(NodeCount{1, 1, 2, 0, 0}, CentOS7, aws, func(nodes provisionedNodes, sshKey string) {
+				By("Setting the hostnames to be different than the actual ones")
+				loadBalancedFQDN := nodes.master[0].PublicIP
+				nodes.etcd[0].Hostname = "etcd01"
+				nodes.master[0].Hostname = "master01"
+				nodes.worker[0].Hostname = "worker01"
+				nodes.worker[1].Hostname = "worker02"
+
+				plan := PlanAWS{
+					AllowPackageInstallation: true,
+					Etcd:                nodes.etcd,
+					Master:              nodes.master,
+					MasterNodeFQDN:      loadBalancedFQDN,
+					MasterNodeShortName: loadBalancedFQDN,
+					Worker:              nodes.worker[0:1],
+					SSHKeyFile:          sshKey,
+					SSHUser:             nodes.master[0].SSHUser,
+					ModifyHostsFiles:    true,
+				}
+
+				By("Installing kismatic with bogus hostnames that are added to hosts files")
+				err := installKismaticWithPlan(plan, sshKey)
+				Expect(err).ToNot(HaveOccurred())
+
+				By("Adding a worker with a bogus hostname that is added to hosts files")
+				err = addWorkerToKismaticMini(nodes.worker[1])
+				Expect(err).ToNot(HaveOccurred())
+			})
+		})
+	})
+})