Merge pull request #124 from JoshVanL/upgrade-k8s-dependancies

Upgrade k8s dependancies

Author: jetstack-bot

go.mod

@@ -5,37 +5,19 @@ go 1.13
 require (
 	github.com/golang/mock v1.2.0
 	github.com/heptiolabs/healthcheck v0.0.0-20180807145615-6ff867650f40
-	github.com/jstemmer/go-junit-report v0.9.1 // indirect
 	github.com/onsi/ginkgo v1.10.1
 	github.com/onsi/gomega v1.7.0
 	github.com/sirupsen/logrus v1.4.2
 	github.com/spf13/cobra v0.0.5
 	github.com/spf13/pflag v1.0.5
-	golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac // indirect
 	gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0 // indirect
 	gopkg.in/square/go-jose.v2 v2.3.1
-	k8s.io/api v0.0.0-20191114100352-16d7abae0d2a
-	k8s.io/apimachinery v0.0.0-20191028221656-72ed19daf4bb
-	k8s.io/apiserver v0.0.0-20191003001037-3c8b233e046c
-	k8s.io/cli-runtime v0.0.0-20191114110141-0a35778df828
-	k8s.io/client-go v11.0.0+incompatible
-	k8s.io/component-base v0.0.0-20191114102325-35a9586014f7
+	k8s.io/api v0.17.0
+	k8s.io/apimachinery v0.17.0
+	k8s.io/apiserver v0.17.0
+	k8s.io/cli-runtime v0.17.0
+	k8s.io/client-go v0.17.0
+	k8s.io/component-base v0.17.0
 	k8s.io/klog v1.0.0
-	sigs.k8s.io/kind v0.5.1
+	sigs.k8s.io/kind v0.7.0
 )
-
-replace (
-	github.com/golang/mock => github.com/golang/mock v1.3.1
-	k8s.io/api => k8s.io/api v0.0.0-20191114100352-16d7abae0d2a
-	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191028221656-72ed19daf4bb
-	k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20191114110141-0a35778df828
-	k8s.io/client-go => k8s.io/client-go v0.0.0-20191114101535-6c5935290e33
-	k8s.io/code-generator => k8s.io/code-generator v0.0.0-20191004115455-8e001e5d1894
-	k8s.io/component-base => k8s.io/component-base v0.0.0-20191114102325-35a9586014f7
-	k8s.io/metrics => k8s.io/metrics v0.0.0-20191114105837-a4a2842dc51b
-	sigs.k8s.io/kind => sigs.k8s.io/kind v0.5.1
-)
-
-replace k8s.io/kubectl => k8s.io/kubectl v0.0.0-20190918164019-21692a0861df
-
-replace k8s.io/apiserver => k8s.io/apiserver v0.0.0-20191003001037-3c8b233e046c

go.sum

@@ -2,9 +2,14 @@
 package fake
 
 import (
+	"context"
+
 	authv1 "k8s.io/api/authentication/v1"
+	clientauthv1 "k8s.io/client-go/kubernetes/typed/authentication/v1"
 )
 
+var _ clientauthv1.TokenReviewInterface = &FakeReviewer{}
+
 type FakeReviewer struct {
 	CreateFn func(*authv1.TokenReview) (*authv1.TokenReview, error)
 }
@@ -21,6 +26,10 @@ func (f *FakeReviewer) Create(req *authv1.TokenReview) (*authv1.TokenReview, err
 	return f.CreateFn(req)
 }
 
+func (f *FakeReviewer) CreateContext(ctx context.Context, req *authv1.TokenReview) (*authv1.TokenReview, error) {
+	return f.CreateFn(req)
+}
+
 func (f *FakeReviewer) WithCreate(req *authv1.TokenReview, err error) *FakeReviewer {
 	f.CreateFn = func(*authv1.TokenReview) (*authv1.TokenReview, error) {
 		return req, err

pkg/proxy/tokenreview/fake/tokenreview.go

@@ -32,8 +32,8 @@ func create() {
 	env, err := environment.Create(1, 1)
 	errExit(err)
 
-	fmt.Printf("dev environment created.\nexport KUBECONFIG=%s\n",
-		env.KubeConfigPath())
+	fmt.Printf("dev environment created.\n")
+	fmt.Printf("export KUBECONFIG=%s\n", env.KubeConfigPath())
 }
 
 func destroy() {

test/environment/dev/dev.go

@@ -13,7 +13,7 @@ import (
 )
 
 const (
-	defaultNodeImage = "1.16.1"
+	defaultNodeImage = "1.17.0"
 	defaultRootPath  = "../../."
 )
 
@@ -90,7 +90,7 @@ func (e *Environment) Node(name string) (*nodes.Node, error) {
 
 	var node *nodes.Node
 	for _, n := range ns {
-		if n.Name() == name {
+		if n.String() == name {
 			node = &n
 			break
 		}

test/environment/environment.go

@@ -11,6 +11,7 @@ import (
 	"strings"
 
 	log "github.com/sirupsen/logrus"
+	"sigs.k8s.io/kind/pkg/cluster/nodeutils"
 )
 
 func (k *Kind) LoadKubeOIDCProxy() error {
@@ -61,7 +62,7 @@ func (k *Kind) loadImage(binPath, mainPath, image, dockerfilePath string) error
 		return err
 	}
 
-	nodes, err := k.ctx.ListNodes()
+	nodes, err := k.Nodes()
 	if err != nil {
 		return err
 	}
@@ -72,9 +73,9 @@ func (k *Kind) loadImage(binPath, mainPath, image, dockerfilePath string) error
 	}
 
 	for _, node := range nodes {
-		log.Infof("kind: loading image %q to node %q", image, node.Name())
+		log.Infof("kind: loading image %q to node %q", image, node.String())
 		r := bytes.NewBuffer(b)
-		if err := node.LoadImageArchive(r); err != nil {
+		if err := nodeutils.LoadImageArchive(node, r); err != nil {
 			return err
 		}
 

test/kind/image.go

@@ -3,6 +3,9 @@ package kind
 
 import (
 	"fmt"
+	"io/ioutil"
+	"os"
+	"path/filepath"
 	"strings"
 	"time"
 
@@ -13,16 +16,19 @@ import (
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
-	configv1alpha3 "sigs.k8s.io/kind/pkg/apis/config/v1alpha3"
+	configv1alpha4 "sigs.k8s.io/kind/pkg/apis/config/v1alpha4"
 	"sigs.k8s.io/kind/pkg/cluster"
-	"sigs.k8s.io/kind/pkg/cluster/create"
 	"sigs.k8s.io/kind/pkg/cluster/nodes"
 )
 
+const (
+	clusterName = "kube-oidc-proxy-e2e"
+)
+
 type Kind struct {
 	rootPath string
 
-	ctx        *cluster.Context
+	provider   *cluster.Provider
 	restConfig *rest.Config
 	client     *kubernetes.Clientset
 }
@@ -32,51 +38,62 @@ func New(rootPath, nodeImage string, masterNodes, workerNodes int) (*Kind, error
 
 	k := &Kind{
 		rootPath: rootPath,
-		ctx:      cluster.NewContext("kube-oidc-proxy-e2e"),
 	}
 
-	conf := new(configv1alpha3.Cluster)
-	configv1alpha3.SetDefaults_Cluster(conf)
+	conf := new(configv1alpha4.Cluster)
+	configv1alpha4.SetDefaultsCluster(conf)
 	conf.Nodes = nil
 
 	// This behviour will be changing soon in later versions of kind.
 	if workerNodes == 0 {
 		for i := 0; i < masterNodes; i++ {
 			conf.Nodes = append(conf.Nodes,
-				configv1alpha3.Node{
+				configv1alpha4.Node{
 					Image: nodeImage,
 				})
 		}
 
 	} else {
 		for i := 0; i < masterNodes; i++ {
 			conf.Nodes = append(conf.Nodes,
-				configv1alpha3.Node{
+				configv1alpha4.Node{
 					Image: nodeImage,
-					Role:  configv1alpha3.ControlPlaneRole,
+					Role:  configv1alpha4.ControlPlaneRole,
 				})
 		}
 
 		for i := 0; i < workerNodes; i++ {
 			conf.Nodes = append(conf.Nodes,
-				configv1alpha3.Node{
+				configv1alpha4.Node{
 					Image: nodeImage,
-					Role:  configv1alpha3.WorkerRole,
+					Role:  configv1alpha4.WorkerRole,
 				})
 		}
 	}
 
 	conf.Networking.ServiceSubnet = "10.0.0.0/16"
 
 	// create kind cluster
-	log.Infof("kind: creating kind cluster %q", k.ctx.Name())
-	if err := k.ctx.Create(create.WithV1Alpha3(conf)); err != nil {
-		return nil, fmt.Errorf("failed to create cluster: %s", err)
+	log.Infof("kind: creating kind cluster %q", clusterName)
+	k.provider = cluster.NewProvider()
+	if err := k.provider.Create(
+		clusterName,
+		cluster.CreateWithV1Alpha4Config(conf),
+	); err != nil {
+		return nil, err
 	}
 
 	// generate rest config to kind cluster
-	kubeconfig := k.ctx.KubeConfigPath()
-	restConfig, err := clientcmd.BuildConfigFromFlags("", kubeconfig)
+	kubeconfigData, err := k.provider.KubeConfig(clusterName, false)
+	if err != nil {
+		return nil, err
+	}
+
+	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))
 	}
@@ -96,31 +113,33 @@ func New(rootPath, nodeImage string, masterNodes, workerNodes int) (*Kind, error
 		return nil, k.errDestroy(fmt.Errorf("failed to wait for DNS pods to become ready: %s", err))
 	}
 
-	log.Infof("kind: cluster ready %q", k.ctx.Name())
+	log.Infof("kind: cluster ready %q", clusterName)
 
 	return k, nil
 }
 
 func DeleteCluster(name string) error {
-	ok, err := cluster.IsKnown(name)
+	provider := cluster.NewProvider()
+
+	kubeconfig, err := provider.KubeConfig(clusterName, false)
 	if err != nil {
 		return err
 	}
 
-	if !ok {
-		return fmt.Errorf("cluster unknown: %q", name)
-	}
-
-	return cluster.NewContext(name).Delete()
+	return provider.Delete(clusterName, kubeconfig)
 }
 
 func (k *Kind) Destroy() error {
-	log.Infof("kind: destroying cluster %q", k.ctx.Name())
-	if err := k.ctx.Delete(); err != nil {
+	log.Infof("kind: destroying cluster %q", clusterName)
+	if err := DeleteCluster(clusterName); err != nil {
 		return fmt.Errorf("failed to delete kind cluster: %s", err)
 	}
 
-	log.Infof("kind: destroyed cluster %q", k.ctx.Name())
+	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
 }
@@ -130,11 +149,11 @@ func (k *Kind) KubeClient() *kubernetes.Clientset {
 }
 
 func (k *Kind) KubeConfigPath() string {
-	return k.ctx.KubeConfigPath()
+	return filepath.Join(os.TempDir(), "kube-oidc-proxy-e2e")
 }
 
 func (k *Kind) Nodes() ([]nodes.Node, error) {
-	return k.ctx.ListNodes()
+	return k.provider.ListNodes(clusterName)
 }
 
 func (k *Kind) errDestroy(err error) error {