Fix kubeconfig and loading images in test

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

Author: JoshVanL

test/e2e/suite/suite.go

@@ -23,12 +23,7 @@ var _ = SynchronizedBeforeSuite(func() []byte {
 		log.Fatalf("Error provisioning environment: %v", err)
 	}
 
-	kubeconfig, err := env.KubeConfigPath()
-	if err != nil {
-		log.Fatalf("Failed to determine kubeconfig file: %s", err)
-	}
-
-	cfg.KubeConfigPath = kubeconfig
+	cfg.KubeConfigPath = env.KubeConfigPath()
 	cfg.Kubectl = filepath.Join(env.RootPath(), "bin", "kubectl")
 	cfg.RepoRoot = env.RootPath()
 	cfg.Environment = env

test/environment/dev/dev.go

@@ -33,13 +33,7 @@ func create() {
 	errExit(err)
 
 	fmt.Printf("dev environment created.\n")
-	kubeconfig, err := env.KubeConfigPath()
-	if err != nil {
-		fmt.Printf("failed to determine kubeconfig path: %s", err)
-		return
-	}
-
-	fmt.Printf("export KUBECONFIG=%s", kubeconfig)
+	fmt.Printf("export KUBECONFIG=%s\n", env.KubeConfigPath())
 }
 
 func destroy() {

test/environment/environment.go

@@ -13,7 +13,7 @@ import (
 )
 
 const (
-	defaultNodeImage = "1.16.1"
+	defaultNodeImage = "1.17.0"
 	defaultRootPath  = "../../."
 )
 
@@ -74,7 +74,7 @@ func (e *Environment) KubeClient() *kubernetes.Clientset {
 	return e.kind.KubeClient()
 }
 
-func (e *Environment) KubeConfigPath() (string, error) {
+func (e *Environment) KubeConfigPath() string {
 	return e.kind.KubeConfigPath()
 }
 

test/kind/image.go

@@ -2,6 +2,7 @@
 package kind
 
 import (
+	"bytes"
 	"fmt"
 	"io/ioutil"
 	"os"
@@ -10,6 +11,7 @@ import (
 	"strings"
 
 	log "github.com/sirupsen/logrus"
+	"sigs.k8s.io/kind/pkg/cluster/nodeutils"
 )
 
 func (k *Kind) LoadKubeOIDCProxy() error {
@@ -60,29 +62,29 @@ func (k *Kind) loadImage(binPath, mainPath, image, dockerfilePath string) error
 		return err
 	}
 
-	//nodes, err := k.ctx.ListNodes()
-	//if err != nil {
-	//	return err
-	//}
-
-	//b, err := ioutil.ReadFile(imageArchive)
-	//if err != nil {
-	//	return err
-	//}
-
-	//for _, node := range nodes {
-	//	log.Infof("kind: loading image %q to node %q", image, node.Name())
-	//	r := bytes.NewBuffer(b)
-	//	if err := node.LoadImageArchive(r); err != nil {
-	//		return err
-	//	}
-
-	//	err := node.Command("mkdir", "-p", "/tmp/kube-oidc-proxy").Run()
-	//	if err != nil {
-	//		return fmt.Errorf("failed to create directory %q: %s",
-	//			"/tmp/kube-oidc-proxy", err)
-	//	}
-	//}
+	nodes, err := k.Nodes()
+	if err != nil {
+		return err
+	}
+
+	b, err := ioutil.ReadFile(imageArchive)
+	if err != nil {
+		return err
+	}
+
+	for _, node := range nodes {
+		log.Infof("kind: loading image %q to node %q", image, node.String())
+		r := bytes.NewBuffer(b)
+		if err := nodeutils.LoadImageArchive(node, r); err != nil {
+			return err
+		}
+
+		err := node.Command("mkdir", "-p", "/tmp/kube-oidc-proxy").Run()
+		if err != nil {
+			return fmt.Errorf("failed to create directory %q: %s",
+				"/tmp/kube-oidc-proxy", err)
+		}
+	}
 
 	return nil
 }

test/kind/kind.go

@@ -3,6 +3,9 @@ package kind
 
 import (
 	"fmt"
+	"io/ioutil"
+	"os"
+	"path/filepath"
 	"strings"
 	"time"
 
@@ -81,12 +84,16 @@ func New(rootPath, nodeImage string, masterNodes, workerNodes int) (*Kind, error
 	}
 
 	// generate rest config to kind cluster
-	kubeconfig, err := k.provider.KubeConfig(clusterName, false)
+	kubeconfigData, err := k.provider.KubeConfig(clusterName, false)
 	if err != nil {
 		return nil, err
 	}
 
-	restConfig, err := clientcmd.BuildConfigFromFlags("", kubeconfig)
+	if err := ioutil.WriteFile(k.KubeConfigPath(), []byte(kubeconfigData), 0600); err != nil {
+		return nil, err
+	}
+
+	restConfig, err := clientcmd.BuildConfigFromFlags("", k.KubeConfigPath())
 	if err != nil {
 		return nil, k.errDestroy(fmt.Errorf("failed to build kind rest client: %s", err))
 	}
@@ -128,6 +135,10 @@ func (k *Kind) Destroy() error {
 		return fmt.Errorf("failed to delete kind cluster: %s", err)
 	}
 
+	if err := os.Remove(k.KubeConfigPath()); err != nil {
+		return fmt.Errorf("failed to delete kubeconfig file: %s", err)
+	}
+
 	log.Infof("kind: destroyed cluster %q", clusterName)
 
 	return nil
@@ -137,8 +148,8 @@ func (k *Kind) KubeClient() *kubernetes.Clientset {
 	return k.client
 }
 
-func (k *Kind) KubeConfigPath() (string, error) {
-	return k.provider.KubeConfig(clusterName, false)
+func (k *Kind) KubeConfigPath() string {
+	return filepath.Join(os.TempDir(), "kube-oidc-proxy-e2e")
 }
 
 func (k *Kind) Nodes() ([]nodes.Node, error) {