Replace kubectl cp with exec and re-use image name const throughout

Signed-off-by: JoshVanL <[email protected]>

Author: JoshVanL

test/e2e/framework/framework.go

@@ -16,6 +16,7 @@ import (
 
 	"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/kind"
 	"github.com/jetstack/kube-oidc-proxy/test/util"
 )
 
@@ -115,7 +116,7 @@ func (f *Framework) DeployProxyWith(extraVolumes []corev1.Volume, extraArgs ...s
 	err := f.Helper().DeleteProxy(f.Namespace.Name)
 	Expect(err).NotTo(HaveOccurred())
 
-	err = f.Helper().WaitForDeploymentToDelete(f.Namespace.Name, helper.ProxyName, time.Second*30)
+	err = f.Helper().WaitForDeploymentToDelete(f.Namespace.Name, kind.ProxyImageName, time.Second*30)
 	Expect(err).NotTo(HaveOccurred())
 
 	By(fmt.Sprintf("Deploying kube-oidc-proxy with extra args %s", extraArgs))

test/e2e/framework/helper/deploy.go

@@ -15,21 +15,15 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
 
+	"github.com/jetstack/kube-oidc-proxy/test/kind"
 	"github.com/jetstack/kube-oidc-proxy/test/util"
 )
 
-const (
-	ProxyName         = "kube-oidc-proxy-e2e"
-	IssuerName        = "oidc-issuer-e2e"
-	FakeAPIServerName = "fake-apiserver-e2e"
-	AuditWebhookName  = "audit-webhook-e2e"
-)
-
 func (h *Helper) DeployProxy(ns *corev1.Namespace, issuerURL *url.URL, clientID string,
 	oidcKeyBundle *util.KeyBundle, extraVolumes []corev1.Volume, extraArgs ...string) (*util.KeyBundle, *url.URL, error) {
 	cnt := corev1.Container{
-		Name:            ProxyName,
-		Image:           ProxyName,
+		Name:            kind.ProxyImageName,
+		Image:           kind.ProxyImageName,
 		ImagePullPolicy: corev1.PullNever,
 		Args: append([]string{
 			"kube-oidc-proxy",
@@ -108,7 +102,7 @@ func (h *Helper) DeployProxy(ns *corev1.Namespace, issuerURL *url.URL, clientID
 		return nil, nil, err
 	}
 
-	bundle, appURL, err := h.deployApp(ns.Name, ProxyName, corev1.ServiceTypeNodePort, cnt, volumes...)
+	bundle, appURL, err := h.deployApp(ns.Name, kind.ProxyImageName, corev1.ServiceTypeNodePort, cnt, volumes...)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -118,7 +112,7 @@ func (h *Helper) DeployProxy(ns *corev1.Namespace, issuerURL *url.URL, clientID
 
 	crole, err := h.KubeClient.RbacV1().ClusterRoles().Create(&rbacv1.ClusterRole{
 		ObjectMeta: metav1.ObjectMeta{
-			GenerateName: ProxyName + "-",
+			GenerateName: kind.ProxyImageName + "-",
 			OwnerReferences: []metav1.OwnerReference{
 				metav1.OwnerReference{
 					APIVersion:         "core/v1",
@@ -150,7 +144,7 @@ func (h *Helper) DeployProxy(ns *corev1.Namespace, issuerURL *url.URL, clientID
 	_, err = h.KubeClient.RbacV1().ClusterRoleBindings().Create(
 		&rbacv1.ClusterRoleBinding{
 			ObjectMeta: metav1.ObjectMeta{
-				GenerateName: ProxyName + "-",
+				GenerateName: kind.ProxyImageName + "-",
 				OwnerReferences: []metav1.OwnerReference{
 					metav1.OwnerReference{
 						APIVersion:         "core/v1",
@@ -166,7 +160,7 @@ func (h *Helper) DeployProxy(ns *corev1.Namespace, issuerURL *url.URL, clientID
 				Name: crole.Name, Kind: "ClusterRole",
 			},
 			Subjects: []rbacv1.Subject{
-				{Name: ProxyName, Namespace: ns.Name, Kind: "ServiceAccount"},
+				{Name: kind.ProxyImageName, Namespace: ns.Name, Kind: "ServiceAccount"},
 			},
 		})
 	if err != nil {
@@ -178,8 +172,8 @@ func (h *Helper) DeployProxy(ns *corev1.Namespace, issuerURL *url.URL, clientID
 
 func (h *Helper) DeployIssuer(ns string) (*util.KeyBundle, *url.URL, error) {
 	cnt := corev1.Container{
-		Name:            IssuerName,
-		Image:           IssuerName,
+		Name:            kind.IssuerImageName,
+		Image:           kind.IssuerImageName,
 		ImagePullPolicy: corev1.PullNever,
 		Args: []string{
 			"oidc-issuer",
@@ -202,7 +196,7 @@ func (h *Helper) DeployIssuer(ns string) (*util.KeyBundle, *url.URL, error) {
 		},
 	}
 
-	bundle, appURL, err := h.deployApp(ns, IssuerName, corev1.ServiceTypeClusterIP, cnt)
+	bundle, appURL, err := h.deployApp(ns, kind.IssuerImageName, corev1.ServiceTypeClusterIP, cnt)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -212,8 +206,8 @@ func (h *Helper) DeployIssuer(ns string) (*util.KeyBundle, *url.URL, error) {
 
 func (h *Helper) DeployFakeAPIServer(ns string) ([]corev1.Volume, *url.URL, error) {
 	cnt := corev1.Container{
-		Name:            FakeAPIServerName,
-		Image:           FakeAPIServerName,
+		Name:            kind.FakeAPIServerImageName,
+		Image:           kind.FakeAPIServerImageName,
 		ImagePullPolicy: corev1.PullNever,
 		Args: []string{
 			"fake-apiserver",
@@ -235,7 +229,7 @@ func (h *Helper) DeployFakeAPIServer(ns string) ([]corev1.Volume, *url.URL, erro
 		},
 	}
 
-	bundle, appURL, err := h.deployApp(ns, FakeAPIServerName, corev1.ServiceTypeClusterIP, cnt)
+	bundle, appURL, err := h.deployApp(ns, kind.FakeAPIServerImageName, corev1.ServiceTypeClusterIP, cnt)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -269,8 +263,8 @@ func (h *Helper) DeployFakeAPIServer(ns string) ([]corev1.Volume, *url.URL, erro
 
 func (h *Helper) DeployAuditWebhook(ns, logPath string) (corev1.Volume, *url.URL, error) {
 	cnt := corev1.Container{
-		Name:            AuditWebhookName,
-		Image:           AuditWebhookName,
+		Name:            kind.AuditWebhookImageName,
+		Image:           kind.AuditWebhookImageName,
 		ImagePullPolicy: corev1.PullNever,
 		Args: []string{
 			"audit-webhook",
@@ -293,7 +287,7 @@ func (h *Helper) DeployAuditWebhook(ns, logPath string) (corev1.Volume, *url.URL
 		},
 	}
 
-	bundle, appURL, err := h.deployApp(ns, AuditWebhookName, corev1.ServiceTypeClusterIP, cnt)
+	bundle, appURL, err := h.deployApp(ns, kind.AuditWebhookImageName, corev1.ServiceTypeClusterIP, cnt)
 	if err != nil {
 		return corev1.Volume{}, nil, err
 	}
@@ -463,13 +457,13 @@ func (h *Helper) deployApp(ns, name string, serviceType corev1.ServiceType, cont
 }
 
 func (h *Helper) DeleteProxy(ns string) error {
-	return h.deleteApp(ns, ProxyName, "oidc-ca")
+	return h.deleteApp(ns, kind.ProxyImageName, "oidc-ca")
 }
 func (h *Helper) DeleteIssuer(ns string) error {
-	return h.deleteApp(ns, IssuerName)
+	return h.deleteApp(ns, kind.IssuerImageName)
 }
 func (h *Helper) DeleteFakeAPIServer(ns string) error {
-	return h.deleteApp(ns, FakeAPIServerName)
+	return h.deleteApp(ns, kind.FakeAPIServerImageName)
 }
 
 func (h *Helper) deleteApp(ns, name string, extraSecrets ...string) error {

test/e2e/framework/helper/kubectl.go

@@ -2,6 +2,7 @@
 package helper
 
 import (
+	"io"
 	"os"
 	"os/exec"
 	"strings"
@@ -31,6 +32,10 @@ func (h *Helper) Kubectl(ns string) *Kubectl {
 }
 
 func (k *Kubectl) Run(args ...string) error {
+	return k.RunWithStdout(os.Stdout, args...)
+}
+
+func (k *Kubectl) RunWithStdout(stdout io.Writer, args ...string) error {
 	baseArgs := []string{"--kubeconfig", k.kubeconfig}
 	if k.namespace == "" {
 		baseArgs = append(baseArgs, "--all-namespaces")
@@ -39,7 +44,7 @@ func (k *Kubectl) Run(args ...string) error {
 	}
 	args = append(baseArgs, args...)
 	cmd := exec.Command(k.kubectl, args...)
-	cmd.Stdout = os.Stdout
+	cmd.Stdout = stdout
 	cmd.Stderr = os.Stderr
 	return cmd.Run()
 }

test/e2e/suite/cases/audit/audit.go

@@ -6,10 +6,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
 	"net/http"
-	"os"
-	"path/filepath"
 	"reflect"
 	"time"
 
@@ -160,6 +157,7 @@ func testAuditLogs(f *framework.Framework, podLabelSelector string) {
 	}
 
 	By("Waiting for audit logs to be written")
+	// 5 seconds here is longer than the proxy flush interval.
 	time.Sleep(time.Second * 5)
 
 	By("Copying audit log from proxy locally")
@@ -172,23 +170,12 @@ func testAuditLogs(f *framework.Framework, podLabelSelector string) {
 		Expect(fmt.Errorf("expected single kube-oidc-proxy pod running, got=%d", len(pods.Items))).NotTo(HaveOccurred())
 	}
 
-	tmpDir, err := ioutil.TempDir(os.TempDir(), "kube-oidc-proxy-e2e")
-	Expect(err).NotTo(HaveOccurred())
-
-	defer func() {
-		err := os.RemoveAll(tmpDir)
-		Expect(err).NotTo(HaveOccurred())
-	}()
-
-	logFile := filepath.Join(tmpDir, "log.txt")
-
-	err = f.Helper().Kubectl(f.Namespace.Name).Run(
-		"cp", fmt.Sprintf("%s:audit-log", pods.Items[0].Name), logFile)
-	Expect(err).NotTo(HaveOccurred())
-
-	logs, err := ioutil.ReadFile(logFile)
+	var auditLogsBuffer bytes.Buffer
+	err = f.Helper().Kubectl(f.Namespace.Name).RunWithStdout(&auditLogsBuffer,
+		"exec", pods.Items[0].Name, "cat", "/audit-log")
 	Expect(err).NotTo(HaveOccurred())
 
+	logs := auditLogsBuffer.Bytes()
 	scanner := bufio.NewScanner(bytes.NewReader(logs))
 
 	expAuditEvents := []auditv1.Event{

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

@@ -8,7 +8,7 @@ import (
 	. "github.com/onsi/gomega"
 
 	"github.com/jetstack/kube-oidc-proxy/test/e2e/framework"
-	"github.com/jetstack/kube-oidc-proxy/test/e2e/framework/helper"
+	"github.com/jetstack/kube-oidc-proxy/test/kind"
 )
 
 var _ = framework.CasesDescribe("Readiness Probe", func() {
@@ -34,7 +34,7 @@ var _ = framework.CasesDescribe("Readiness Probe", func() {
 
 		time.Sleep(time.Second * 10)
 
-		err := f.Helper().WaitForDeploymentReady(f.Namespace.Name, helper.ProxyName, time.Second*5)
+		err := f.Helper().WaitForDeploymentReady(f.Namespace.Name, kind.ProxyImageName, time.Second*5)
 		Expect(err).NotTo(HaveOccurred())
 	})
 })

test/kind/image.go

@@ -15,6 +15,13 @@ import (
 	"sigs.k8s.io/kind/pkg/cluster/nodeutils"
 )
 
+const (
+	ProxyImageName         = "kube-oidc-proxy-e2e"
+	IssuerImageName        = "oidc-issuer-e2e"
+	FakeAPIServerImageName = "fake-apiserver-e2e"
+	AuditWebhookImageName  = "audit-webhook-e2e"
+)
+
 func (k *Kind) LoadAllImages() error {
 	if err := k.LoadKubeOIDCProxy(); err != nil {
 		return err
@@ -38,36 +45,32 @@ func (k *Kind) LoadAllImages() error {
 func (k *Kind) LoadKubeOIDCProxy() error {
 	binPath := filepath.Join(k.rootPath, "./bin/kube-oidc-proxy-linux")
 	mainPath := filepath.Join(k.rootPath, "./cmd/.")
-	image := "kube-oidc-proxy-e2e"
 
-	return k.loadImage(binPath, mainPath, image, k.rootPath)
+	return k.loadImage(binPath, mainPath, ProxyImageName, k.rootPath)
 }
 
 func (k *Kind) LoadIssuer() error {
 	binPath := filepath.Join(k.rootPath, "./test/tools/issuer/bin/oidc-issuer-linux")
 	dockerfilePath := filepath.Join(k.rootPath, "./test/tools/issuer")
 	mainPath := filepath.Join(dockerfilePath, "cmd")
-	image := "oidc-issuer-e2e"
 
-	return k.loadImage(binPath, mainPath, image, dockerfilePath)
+	return k.loadImage(binPath, mainPath, IssuerImageName, dockerfilePath)
 }
 
 func (k *Kind) LoadFakeAPIServer() error {
 	binPath := filepath.Join(k.rootPath, "./test/tools/fake-apiserver/bin/fake-apiserver-linux")
 	dockerfilePath := filepath.Join(k.rootPath, "./test/tools/fake-apiserver")
 	mainPath := filepath.Join(dockerfilePath, "cmd")
-	image := "fake-apiserver-e2e"
 
-	return k.loadImage(binPath, mainPath, image, dockerfilePath)
+	return k.loadImage(binPath, mainPath, FakeAPIServerImageName, dockerfilePath)
 }
 
 func (k *Kind) LoadAuditWebhook() error {
 	binPath := filepath.Join(k.rootPath, "./test/tools/audit-webhook/bin/audit-webhook")
 	dockerfilePath := filepath.Join(k.rootPath, "./test/tools/audit-webhook")
 	mainPath := filepath.Join(dockerfilePath, "cmd")
-	image := "audit-webhook-e2e"
 
-	return k.loadImage(binPath, mainPath, image, dockerfilePath)
+	return k.loadImage(binPath, mainPath, AuditWebhookImageName, dockerfilePath)
 }
 
 func (k *Kind) loadImage(binPath, mainPath, image, dockerfilePath string) error {