kubeconfig generation: add tests for kops plugin

Also slightly simplify the tests and Kubecfg Builder signature by passing in the ConfigAccess only when needed.
kubernetes · Aug 30, 2020 · f7c1685 · f7c1685
1 parent 82bd556
commit f7c1685
Show file tree

Hide file tree

Showing 11 changed files with 121 additions and 144 deletions.
diff --git a/cmd/kops/delete_cluster.go b/cmd/kops/delete_cluster.go
@@ -204,9 +204,9 @@ func RunDeleteCluster(ctx context.Context, f *util.Factory, out io.Writer, optio
 		}
 	}
 
-	b := kubeconfig.NewKubeconfigBuilder(clientcmd.NewDefaultPathOptions())
+	b := kubeconfig.NewKubeconfigBuilder()
 	b.Context = clusterName
-	err = b.DeleteKubeConfig()
+	err = b.DeleteKubeConfig(clientcmd.NewDefaultPathOptions())
 	if err != nil {
 		klog.Warningf("error removing kube config: %v", err)
 	}

diff --git a/cmd/kops/export_kubecfg.go b/cmd/kops/export_kubecfg.go
@@ -144,7 +144,6 @@ func RunExportKubecfg(ctx context.Context, f *util.Factory, out io.Writer, optio
 			keyStore,
 			secretStore,
 			&commands.CloudDiscoveryStatusStore{},
-			buildPathOptions(options),
 			options.admin,
 			options.user,
 			options.internal,
@@ -154,7 +153,7 @@ func RunExportKubecfg(ctx context.Context, f *util.Factory, out io.Writer, optio
 			return err
 		}
 
-		if err := conf.WriteKubecfg(); err != nil {
+		if err := conf.WriteKubecfg(buildPathOptions(options)); err != nil {
 			return err
 		}
 	}

diff --git a/cmd/kops/update_cluster.go b/cmd/kops/update_cluster.go
@@ -313,7 +313,6 @@ func RunUpdateCluster(ctx context.Context, f *util.Factory, clusterName string,
 			keyStore,
 			secretStore,
 			&commands.CloudDiscoveryStatusStore{},
-			clientcmd.NewDefaultPathOptions(),
 			c.admin,
 			c.user,
 			c.internal,
@@ -323,7 +322,7 @@ func RunUpdateCluster(ctx context.Context, f *util.Factory, clusterName string,
 			return nil, err
 		}
 
-		err = conf.WriteKubecfg()
+		err = conf.WriteKubecfg(clientcmd.NewDefaultPathOptions())
 		if err != nil {
 			return nil, err
 		}

diff --git a/go.mod b/go.mod
@@ -73,6 +73,7 @@ require (
 	github.com/go-ini/ini v1.51.0
 	github.com/go-logr/logr v0.2.1-0.20200730175230-ee2de8da5be6
 	github.com/gogo/protobuf v1.3.1
+	github.com/google/go-cmp v0.4.0
 	github.com/google/uuid v1.1.1
 	github.com/gophercloud/gophercloud v0.11.1-0.20200518183226-7aec46f32c19
 	github.com/gorilla/mux v1.7.3

diff --git a/pkg/commands/helpers/BUILD.bazel b/pkg/commands/helpers/BUILD.bazel
@@ -13,7 +13,7 @@ go_library(
         "//upup/pkg/fi:go_default_library",
         "//vendor/github.com/spf13/cobra:go_default_library",
         "//vendor/k8s.io/client-go/util/homedir:go_default_library",
-        "//vendor/k8s.io/klog:go_default_library",
+        "//vendor/k8s.io/klog/v2:go_default_library",
         "//vendor/k8s.io/kubectl/pkg/util/i18n:go_default_library",
     ],
 )
diff --git a/pkg/commands/helpers/kubectl_auth.go b/pkg/commands/helpers/kubectl_auth.go
@@ -33,7 +33,7 @@ import (
 
 	"github.com/spf13/cobra"
 	"k8s.io/client-go/util/homedir"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 	"k8s.io/kops/cmd/kops/util"
 	"k8s.io/kops/pkg/commands/commandutils"
 	"k8s.io/kops/pkg/pki"

diff --git a/pkg/kubeconfig/BUILD.bazel b/pkg/kubeconfig/BUILD.bazel
@@ -32,6 +32,6 @@ go_test(
         "//pkg/pki:go_default_library",
         "//upup/pkg/fi:go_default_library",
         "//util/pkg/vfs:go_default_library",
-        "//vendor/k8s.io/client-go/tools/clientcmd:go_default_library",
+        "//vendor/github.com/google/go-cmp/cmp:go_default_library",
     ],
 )
diff --git a/pkg/kubeconfig/create_kubecfg.go b/pkg/kubeconfig/create_kubecfg.go
@@ -23,7 +23,6 @@ import (
 	"sort"
 	"time"
 
-	"k8s.io/client-go/tools/clientcmd"
 	"k8s.io/klog/v2"
 	"k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/pkg/apis/kops/util"
@@ -35,7 +34,7 @@ import (
 
 const DefaultKubecfgAdminLifetime = 18 * time.Hour
 
-func BuildKubecfg(cluster *kops.Cluster, keyStore fi.Keystore, secretStore fi.SecretStore, status kops.StatusStore, configAccess clientcmd.ConfigAccess, admin time.Duration, configUser string, internal bool, kopsStateStore string, useKopsAuthenticationPlugin bool) (*KubeconfigBuilder, error) {
+func BuildKubecfg(cluster *kops.Cluster, keyStore fi.Keystore, secretStore fi.SecretStore, status kops.StatusStore, admin time.Duration, configUser string, internal bool, kopsStateStore string, useKopsAuthenticationPlugin bool) (*KubeconfigBuilder, error) {
 	clusterName := cluster.ObjectMeta.Name
 
 	var master string
@@ -98,7 +97,7 @@ func BuildKubecfg(cluster *kops.Cluster, keyStore fi.Keystore, secretStore fi.Se
 		}
 	}
 
-	b := NewKubeconfigBuilder(configAccess)
+	b := NewKubeconfigBuilder()
 
 	b.Context = clusterName
 	b.Server = server
@@ -152,14 +151,20 @@ func BuildKubecfg(cluster *kops.Cluster, keyStore fi.Keystore, secretStore fi.Se
 	}
 
 	if useKopsAuthenticationPlugin {
+		// The api version is an internal implementation detail, the contract used with kubectl.
+		apiVersion := "v1beta1"
+
+		// TODO(justinsb): rationalize with other kubectl lifetime flags
+		lifetime := time.Hour
+
 		b.AuthenticationExec = []string{
 			"kops",
 			"helpers",
 			"kubectl-auth",
 			"--cluster=" + clusterName,
 			"--state=" + kopsStateStore,
-			"--lifetime=1h",
-			"--api-version=" + "v1beta1",
+			"--lifetime=" + lifetime.String(),
+			"--api-version=" + apiVersion,
 		}
 	}