Merge pull request #130 from JoshVanL/dev-cluster-deploy

Adds `make dev_cluster_deploy`

Author: jetstack-bot

Makefile

@@ -108,5 +108,8 @@ image: all docker_build ## runs tests, build and docker build
 dev_cluster_create: ## create dev cluster for development testing
 	KUBE_OIDC_PROXY_ROOT_PATH="$$(pwd)" go run -v ./test/environment/dev create
 
+dev_cluster_deploy: ## deploy into dev cluster
+	KUBE_OIDC_PROXY_ROOT_PATH="$$(pwd)" go run -v ./test/environment/dev deploy
+
 dev_cluster_destroy: ## destroy dev cluster
 	KUBE_OIDC_PROXY_ROOT_PATH="$$(pwd)" go run -v ./test/environment/dev destroy

test/e2e/framework/framework.go

@@ -4,6 +4,7 @@ package framework
 import (
 	"fmt"
 	"net/url"
+	"time"
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
@@ -20,10 +21,6 @@ import (
 
 var DefaultConfig = &config.Config{}
 
-const (
-	clientID = "kube-oidc-proxy-e1e-client_id"
-)
-
 type Framework struct {
 	BaseName string
 
@@ -105,17 +102,16 @@ func (f *Framework) AfterEach() {
 	By("Deleting test namespace")
 	err = f.DeleteKubeNamespace(f.Namespace.Name)
 	Expect(err).NotTo(HaveOccurred())
-
-	By("Waiting for test namespace to no longer exist")
-	err = f.WaitForKubeNamespaceNotExist(f.Namespace.Name)
-	Expect(err).NotTo(HaveOccurred())
 }
 
 func (f *Framework) DeployProxyWith(extraVolumes []corev1.Volume, extraArgs ...string) {
 	By("Deleting kube-oidc-proxy deployment")
 	err := f.Helper().DeleteProxy(f.Namespace.Name)
 	Expect(err).NotTo(HaveOccurred())
 
+	err = f.Helper().WaitForDeploymentToDelete(f.Namespace.Name, helper.ProxyName, time.Second*30)
+	Expect(err).NotTo(HaveOccurred())
+
 	By(fmt.Sprintf("Deploying kube-oidc-proxy with extra args %s", extraArgs))
 	f.proxyKeyBundle, f.proxyURL, err = f.helper.DeployProxy(f.Namespace, f.issuerURL,
 		clientID, f.issuerKeyBundle, extraVolumes, extraArgs...)

test/e2e/framework/helper/deploy.go

@@ -8,6 +8,7 @@ import (
 	"strconv"
 	"time"
 
+	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	rbacv1 "k8s.io/api/rbac/v1"
 	k8sErrors "k8s.io/apimachinery/pkg/api/errors"
@@ -303,27 +304,42 @@ func (h *Helper) deployApp(ns, name string, serviceType corev1.ServiceType, cont
 		},
 	}
 
-	pod := &corev1.Pod{
+	deploy := &appsv1.Deployment{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      name,
 			Namespace: ns,
 			Labels: map[string]string{
 				"app": name,
 			},
 		},
-		Spec: corev1.PodSpec{
-			ServiceAccountName: name,
-			Containers:         []corev1.Container{container},
-			Volumes: append(volumes,
-				corev1.Volume{
-					Name: "tls",
-					VolumeSource: corev1.VolumeSource{
-						Secret: &corev1.SecretVolumeSource{
-							SecretName: name,
-						},
+		Spec: appsv1.DeploymentSpec{
+			Selector: &metav1.LabelSelector{
+				MatchLabels: map[string]string{
+					"app": name,
+				},
+			},
+			Template: corev1.PodTemplateSpec{
+				ObjectMeta: metav1.ObjectMeta{
+					Labels: map[string]string{
+						"app": name,
 					},
 				},
-			),
+
+				Spec: corev1.PodSpec{
+					ServiceAccountName: name,
+					Containers:         []corev1.Container{container},
+					Volumes: append(volumes,
+						corev1.Volume{
+							Name: "tls",
+							VolumeSource: corev1.VolumeSource{
+								Secret: &corev1.SecretVolumeSource{
+									SecretName: name,
+								},
+							},
+						},
+					),
+				},
+			},
 		},
 	}
 
@@ -347,12 +363,12 @@ func (h *Helper) deployApp(ns, name string, serviceType corev1.ServiceType, cont
 		return nil, nil, err
 	}
 
-	_, err = h.KubeClient.CoreV1().Pods(ns).Create(pod)
+	_, err = h.KubeClient.AppsV1().Deployments(ns).Create(deploy)
 	if err != nil {
 		return nil, nil, err
 	}
 
-	if err := h.WaitForPodReady(ns, name, time.Second*20); err != nil {
+	if err := h.WaitForDeploymentReady(ns, name, time.Second*20); err != nil {
 		return nil, nil, err
 	}
 
@@ -376,7 +392,7 @@ func (h *Helper) DeleteFakeAPIServer(ns string) error {
 }
 
 func (h *Helper) deleteApp(ns, name string, extraSecrets ...string) error {
-	err := h.KubeClient.CoreV1().Pods(ns).Delete(name, nil)
+	err := h.KubeClient.AppsV1().Deployments(ns).Delete(name, nil)
 	if err != nil && !k8sErrors.IsNotFound(err) {
 		return err
 	}
@@ -398,10 +414,6 @@ func (h *Helper) deleteApp(ns, name string, extraSecrets ...string) error {
 		return err
 	}
 
-	if err := h.WaitForPodDeletion(ns, name, time.Second*30); err != nil {
-		return err
-	}
-
 	return nil
 }
 

test/e2e/framework/helper/pod.go renamed to test/e2e/framework/helper/poll.go

@@ -12,10 +12,42 @@ import (
 	"k8s.io/apimachinery/pkg/util/wait"
 )
 
+func (h *Helper) WaitForDeploymentReady(namespace, name string, timeout time.Duration) error {
+	log.Infof("Waiting for Deployment to become ready %s/%s", namespace, name)
+
+	err := wait.PollImmediate(time.Second*2, timeout, func() (bool, error) {
+		deploy, err := h.KubeClient.AppsV1().Deployments(namespace).Get(name, metav1.GetOptions{})
+		if err != nil {
+			return false, err
+		}
+
+		if deploy.Spec.Replicas == nil {
+			return false, nil
+		}
+
+		if *deploy.Spec.Replicas == deploy.Status.ReadyReplicas {
+			return true, nil
+		}
+
+		return false, nil
+	})
+
+	if err != nil {
+		kErr := h.Kubectl(namespace).DescribeResource("deployment", name)
+		if kErr != nil {
+			err = fmt.Errorf("%s\n%s", err, kErr)
+		}
+
+		return err
+	}
+
+	return nil
+}
+
 func (h *Helper) WaitForPodReady(namespace, name string, timeout time.Duration) error {
 	log.Infof("Waiting for Pod to become ready %s/%s", namespace, name)
 
-	err := wait.PollImmediate(time.Second*5, timeout, func() (bool, error) {
+	err := wait.PollImmediate(time.Second*2, timeout, func() (bool, error) {
 		pod, err := h.KubeClient.CoreV1().Pods(namespace).Get(name, metav1.GetOptions{})
 		if err != nil {
 			return false, err
@@ -54,26 +86,24 @@ func (h *Helper) WaitForPodReady(namespace, name string, timeout time.Duration)
 	return nil
 }
 
-func (h *Helper) WaitForPodDeletion(namespace, name string, timeout time.Duration) error {
-	log.Infof("Waiting for Pod to be deleted %s/%s", namespace, name)
+func (h *Helper) WaitForDeploymentToDelete(namespace, name string, timeout time.Duration) error {
+	log.Infof("Waiting for Deployment to be deleted: %s/%s", namespace, name)
 
-	err := wait.PollImmediate(time.Second*5, timeout, func() (bool, error) {
-		pod, err := h.KubeClient.CoreV1().Pods(namespace).Get(name, metav1.GetOptions{})
+	err := wait.PollImmediate(time.Second*2, timeout, func() (bool, error) {
+		_, err := h.KubeClient.AppsV1().Deployments(namespace).Get(name, metav1.GetOptions{})
 		if k8sErrors.IsNotFound(err) {
 			return true, nil
 		}
 
 		if err != nil {
-			return false, err
+			return false, nil
 		}
 
-		log.Infof("helper: pod not deleted %s/%s: %v",
-			pod.Namespace, pod.Name, pod.Status.Conditions)
-
 		return false, nil
 	})
+
 	if err != nil {
-		kErr := h.Kubectl(namespace).DescribeResource("pod", name)
+		kErr := h.Kubectl(namespace).DescribeResource("deployment", name)
 		if kErr != nil {
 			err = fmt.Errorf("%s\n%s", err, kErr)
 		}

test/e2e/framework/util.go

@@ -12,6 +12,10 @@ import (
 	"k8s.io/client-go/kubernetes"
 )
 
+const (
+	clientID = "kube-oidc-proxy-e2e-client_id"
+)
+
 // CreateKubeNamespace creates a new Kubernetes Namespace for a test.
 func (f *Framework) CreateKubeNamespace(baseName string) (*corev1.Namespace, error) {
 	ns := &corev1.Namespace{

test/e2e/suite/cases/probe/probe.go

@@ -34,7 +34,7 @@ var _ = framework.CasesDescribe("Readiness Probe", func() {
 
 		time.Sleep(time.Second * 10)
 
-		err := f.Helper().WaitForPodReady(f.Namespace.Name, helper.ProxyName, time.Second*5)
+		err := f.Helper().WaitForDeploymentReady(f.Namespace.Name, helper.ProxyName, time.Second*5)
 		Expect(err).NotTo(HaveOccurred())
 	})
 })

test/environment/dev/dev.go

@@ -4,11 +4,24 @@ package main
 import (
 	"fmt"
 	"os"
+	"path/filepath"
+	"time"
 
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/cli-runtime/pkg/genericclioptions"
+	"k8s.io/client-go/kubernetes"
+
+	"github.com/jetstack/kube-oidc-proxy/test/e2e/framework/config"
+	"github.com/jetstack/kube-oidc-proxy/test/e2e/framework/helper"
 	"github.com/jetstack/kube-oidc-proxy/test/environment"
 	"github.com/jetstack/kube-oidc-proxy/test/kind"
 )
 
+const (
+	clientID = "kube-oidc-proxy-e2e-client-id"
+)
+
 func main() {
 	if len(os.Args) != 2 {
 		errExit(fmt.Errorf("expecting 2 arguments, got=%d",
@@ -18,11 +31,13 @@ func main() {
 	switch os.Args[1] {
 	case "create":
 		create()
+	case "deploy":
+		deploy()
 	case "destroy":
 		destroy()
 	default:
-		errExit(fmt.Errorf("unexpected argument %q, expecting %q or %q",
-			os.Args[1], "create", "destroy"))
+		errExit(fmt.Errorf("unexpected argument %q, expecting [%q %q %q]",
+			os.Args[1], "create", "deploy", "destroy"))
 	}
 
 	os.Exit(0)
@@ -32,13 +47,69 @@ func create() {
 	env, err := environment.Create(1, 1)
 	errExit(err)
 
-	fmt.Printf("dev environment created.\n")
+	fmt.Printf("> dev environment created.\n")
 	fmt.Printf("export KUBECONFIG=%s\n", env.KubeConfigPath())
 }
 
+func deploy() {
+	k := new(kind.Kind)
+	kubeconfig := k.KubeConfigPath()
+	rootPath, err := environment.RootPath()
+	errExit(err)
+
+	cfg := &config.Config{
+		KubeConfigPath: kubeconfig,
+		RepoRoot:       rootPath,
+		Kubectl:        filepath.Join(rootPath, "bin", "kubectl"),
+	}
+
+	err = cfg.Validate()
+	errExit(err)
+
+	helper := helper.NewHelper(cfg)
+
+	clientConfigFlags := genericclioptions.NewConfigFlags(true)
+	clientConfigFlags.KubeConfig = &kubeconfig
+	config, err := clientConfigFlags.ToRESTConfig()
+	errExit(err)
+
+	kubeClient, err := kubernetes.NewForConfig(config)
+	errExit(err)
+
+	helper.KubeClient = kubeClient
+
+	ns := &corev1.Namespace{
+		ObjectMeta: metav1.ObjectMeta{
+			GenerateName: "kube-oidc-proxy-e2e-",
+		},
+	}
+	ns, err = kubeClient.CoreV1().Namespaces().Create(ns)
+	errExit(err)
+
+	fmt.Printf("> created new namespace %s\n", ns.Name)
+
+	issuerKeyBundle, issuerURL, err := helper.DeployIssuer(ns.Name)
+	errExit(err)
+
+	fmt.Printf("> deployed issuer at url %s\n", issuerURL)
+
+	_, proxyURL, err := helper.DeployProxy(ns, issuerURL,
+		"kube-oidc-proxy-e2e-client-id", issuerKeyBundle, nil)
+	errExit(err)
+	fmt.Printf("> deployed proxy at url %s\n", proxyURL)
+
+	tokenPayload := helper.NewTokenPayload(issuerURL, clientID, time.Now().Add(time.Hour*48))
+
+	signedToken, err := helper.SignToken(issuerKeyBundle, tokenPayload)
+	errExit(err)
+	fmt.Printf("> signed token valid for 48 hours:\n%s\n", signedToken)
+
+	fmt.Printf("export KUBECONFIG=%s\n", kubeconfig)
+}
+
 func destroy() {
 	errExit(kind.DeleteCluster("kube-oidc-proxy-e2e"))
-	fmt.Printf("dev environment destroyed.\n")
+	fmt.Printf("> dev environment destroyed.\n")
 }
 
 func errExit(err error) {