Merge pull request #72 from phillc/master

Add test for adding a tls port

Author: phillc

e2e/Makefile

@@ -4,15 +4,20 @@ IMG ?= linode/linode-cloud-controller-manager:latest
 imports: $(GOPATH)/bin/goimports
 	goimports -w test
 
-.PHONY: test
-test: $(GOPATH)/bin/ginkgo
+.PHONY: test reuse-and-test
+
+reuse-and-test: SUITE_ARGS='--reuse'
+
+test reuse-and-test: $(GOPATH)/bin/ginkgo
 	@if [ -z "${LINODE_API_TOKEN}" ]; then\
 		echo "Skipping Test, LINODE_API_TOKEN is not set";\
 	else \
 		go list -m; \
-		ginkgo -r --v --progress --trace --cover -- --v=3 --image=${IMG}; \
+		ginkgo -r --v --progress --trace --cover $(TEST_ARGS) -- --v=3 --image=${IMG} $(SUITE_ARGS); \
 	fi
 
+
+
 install-terraform:
 	sudo apt-get install wget unzip
 	wget https://releases.hashicorp.com/terraform/0.11.13/terraform_0.11.13_linux_amd64.zip

e2e/README.md

@@ -51,3 +51,5 @@ Come back here and run the tests
 cd e2e
 make test
 ```
+
+To save time on multiple runs by allowing the cluster to remain, use `make reuse-and-test`

e2e/test/ccm_e2e_test.go

@@ -17,7 +17,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/intstr"
 )
 
-var _ = Describe("CloudControllerManager", func() {
+var _ = Describe("e2e tests", func() {
 	var (
 		err     error
 		f       *framework.Invocation
@@ -82,6 +82,11 @@ var _ = Describe("CloudControllerManager", func() {
 		Expect(err).NotTo(HaveOccurred())
 	}
 
+	var updateServiceWithAnnotations = func(labels map[string]string, annotations map[string]string, ports []core.ServicePort, isSessionAffinityClientIP bool) {
+		err = f.LoadBalancer.UpdateService(labels, annotations, ports, isSessionAffinityClientIP)
+		Expect(err).NotTo(HaveOccurred())
+	}
+
 	var deleteNodeBalancer = func(id int) {
 		err = getLinodeClient().DeleteNodeBalancer(context.Background(), id)
 		Expect(err).NotTo(HaveOccurred())
@@ -453,6 +458,101 @@ var _ = Describe("CloudControllerManager", func() {
 				})
 			})
 
+			Context("With HTTP updating to have HTTPS", func() {
+				var (
+					pods        []string
+					labels      map[string]string
+					annotations map[string]string
+					secretName  string
+				)
+				BeforeEach(func() {
+					pods = []string{"tls-pod"}
+					secretName = "tls-secret-1"
+					labels = map[string]string{
+						"app": "test-loadbalancer",
+					}
+					annotations = map[string]string{
+						annLinodeDefaultProtocol:         "https",
+						annLinodePortConfigPrefix + "80": `{"protocol": "http"}`,
+					}
+					ports := []core.ContainerPort{
+						{
+							Name:          "alpha",
+							ContainerPort: 8080,
+						},
+					}
+					servicePorts := []core.ServicePort{
+						{
+							Name:       "http",
+							Port:       80,
+							TargetPort: intstr.FromInt(8080),
+							Protocol:   "TCP",
+						},
+					}
+
+					By("Creating Pod")
+					createPodWithLabel(pods, ports, framework.TestServerImage, labels, false)
+
+					By("Creating Service")
+					createServiceWithAnnotations(labels, annotations, servicePorts, false)
+
+					By("Creating Secret")
+					err = f.LoadBalancer.CreateTLSSecret(secretName)
+					Expect(err).NotTo(HaveOccurred())
+
+					By("Updating the Service")
+					updateAnnotations := map[string]string{
+						annLinodeDefaultProtocol:          "https",
+						annLinodePortConfigPrefix + "80":  `{"protocol": "http"}`,
+						annLinodePortConfigPrefix + "443": `{"tls-secret-name": "` + secretName + `", "protocol": "https"}`,
+					}
+					updateServicePorts := []core.ServicePort{
+						{
+							Name:       "http",
+							Port:       80,
+							TargetPort: intstr.FromInt(8080),
+							Protocol:   "TCP",
+						},
+						{
+							Name:       "https",
+							Port:       443,
+							TargetPort: intstr.FromInt(8080),
+							Protocol:   "TCP",
+						},
+					}
+					updateServiceWithAnnotations(labels, updateAnnotations, updateServicePorts, false)
+				})
+
+				AfterEach(func() {
+					By("Deleting the Secrets")
+					deletePods(pods)
+
+					By("Deleting the Service")
+					deleteService()
+
+					By("Deleting the Secret")
+					deleteSecret(secretName)
+				})
+
+				It("should reach the pods", func() {
+					By("Checking TCP Response")
+					eps, err := f.LoadBalancer.GetHTTPEndpoints()
+					Expect(err).NotTo(HaveOccurred())
+					Expect(len(eps)).Should(BeNumerically("==", 2))
+
+					// in order of the spec
+					http80, https443 := eps[0], eps[1]
+
+					waitForResponse := func(endpoint string, fn func(string, string) error) {
+						By("Waiting for Response from the LoadBalancer url: " + endpoint)
+						err := fn(endpoint, pods[0])
+						Expect(err).NotTo(HaveOccurred())
+					}
+					waitForResponse(http80, framework.WaitForHTTPResponse)
+					waitForResponse(https443, framework.WaitForHTTPSResponse)
+				})
+			})
+
 			Context("With SessionAffinity", func() {
 				var (
 					pods   []string

e2e/test/ccm_suite_test.go

@@ -24,15 +24,15 @@ import (
 
 var (
 	useExisting = false
-	dlt         = false
-	ClusterName = rand.WithUniqSuffix("ccm-linode")
+	reuse       = false
+	clusterName string
 )
 
 func init() {
 	flag.StringVar(&framework.Image, "image", framework.Image, "registry/repository:tag")
 	flag.StringVar(&framework.ApiToken, "api-token", os.Getenv("LINODE_API_TOKEN"), "linode api token")
-	flag.BoolVar(&dlt, "delete", dlt, "Delete cluster after test")
-	flag.BoolVar(&useExisting, "use-existing", useExisting, "Use existing kubernetes cluster")
+	flag.BoolVar(&reuse, "reuse", reuse, "Create a cluster and continue to use it")
+	flag.BoolVar(&useExisting, "use-existing", useExisting, "Use an existing kubernetes cluster")
 	flag.StringVar(&framework.KubeConfigFile, "kubeconfig", filepath.Join(homedir.HomeDir(), ".kube/config"), "To use existing cluster provide kubeconfig file")
 }
 
@@ -68,12 +68,27 @@ var getLinodeClient = func() *linodego.Client {
 }
 
 var _ = BeforeSuite(func() {
+	if reuse {
+		clusterName = "ccm-linode-for-reuse"
+	} else {
+		clusterName = rand.WithUniqSuffix("ccm-linode")
+	}
+
+	dir, err := os.Getwd()
+	Expect(err).NotTo(HaveOccurred())
+	kubeConfigFile := filepath.Join(dir, clusterName+".conf")
+
+	if reuse {
+		if _, err := os.Stat(kubeConfigFile); !os.IsNotExist(err) {
+			useExisting = true
+			framework.KubeConfigFile = kubeConfigFile
+		}
+	}
+
 	if !useExisting {
-		err := framework.CreateCluster(ClusterName)
-		Expect(err).NotTo(HaveOccurred())
-		dir, err := os.Getwd()
+		err := framework.CreateCluster(clusterName)
 		Expect(err).NotTo(HaveOccurred())
-		framework.KubeConfigFile = filepath.Join(dir, ClusterName+".conf")
+		framework.KubeConfigFile = kubeConfigFile
 	}
 
 	By("Using kubeconfig from " + framework.KubeConfigFile)
@@ -93,8 +108,11 @@ var _ = BeforeSuite(func() {
 })
 
 var _ = AfterSuite(func() {
-	if dlt || !useExisting {
-		err := framework.DeleteCluster(ClusterName)
+	if !(useExisting || reuse) {
+		By("Deleting cluster")
+		err := framework.DeleteCluster(clusterName)
 		Expect(err).NotTo(HaveOccurred())
+	} else {
+		By("Not deleting cluster")
 	}
 })

e2e/test/framework/service.go

@@ -13,7 +13,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/wait"
 )
 
-func (i *lbInvocation) CreateService(selector, annotations map[string]string, ports []core.ServicePort, isSessionAffinityClientIP bool) error {
+func (i *lbInvocation) createOrUpdateService(selector, annotations map[string]string, ports []core.ServicePort, isSessionAffinityClientIP bool, isCreate bool) error {
 	var sessionAffinity core.ServiceAffinity = "None"
 	if isSessionAffinityClientIP {
 		sessionAffinity = "ClientIP"
@@ -35,14 +35,36 @@ func (i *lbInvocation) CreateService(selector, annotations map[string]string, po
 		},
 	}
 
-	_, err := i.kubeClient.CoreV1().Services(i.Namespace()).Create(svc)
-	if err != nil {
-		return err
+	service := i.kubeClient.CoreV1().Services(i.Namespace())
+	if isCreate {
+		_, err := service.Create(svc)
+		if err != nil {
+			return err
+		}
+	} else {
+		options := metav1.GetOptions{}
+		resource, err := service.Get(TestServerResourceName, options)
+		if err != nil {
+			return err
+		}
+		svc.ObjectMeta.ResourceVersion = resource.ResourceVersion
+		svc.Spec.ClusterIP = resource.Spec.ClusterIP
+		_, err = service.Update(svc)
+		if err != nil {
+			return err
+		}
 	}
 
 	return i.waitForServerReady()
 }
 
+func (i *lbInvocation) CreateService(selector, annotations map[string]string, ports []core.ServicePort, isSessionAffinityClientIP bool) error {
+	return i.createOrUpdateService(selector, annotations, ports, isSessionAffinityClientIP, true)
+}
+func (i *lbInvocation) UpdateService(selector, annotations map[string]string, ports []core.ServicePort, isSessionAffinityClientIP bool) error {
+	return i.createOrUpdateService(selector, annotations, ports, isSessionAffinityClientIP, false)
+}
+
 func (i *lbInvocation) DeleteService() error {
 	err := i.kubeClient.CoreV1().Services(i.Namespace()).Delete(TestServerResourceName, nil)
 	return err