From aebe742291289f917cbe69be482b0c45c9ea5fc4 Mon Sep 17 00:00:00 2001
From: Peter Rifel <pgrifel@gmail.com>
Date: Fri, 6 Nov 2020 08:07:55 -0600
Subject: [PATCH] Remove unused bearer token field from kubeconfig builder

```
$ grep -r KubeBearerToken . | wc -l
0
```
---
 pkg/kubeconfig/kubecfg_builder.go | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/pkg/kubeconfig/kubecfg_builder.go b/pkg/kubeconfig/kubecfg_builder.go
index 0946bcc55a..e60003170e 100644
--- a/pkg/kubeconfig/kubecfg_builder.go
+++ b/pkg/kubeconfig/kubecfg_builder.go
@@ -33,10 +33,9 @@ type KubeconfigBuilder struct {
 	Context   string
 	Namespace string
 
-	User            string
-	KubeBearerToken string
-	KubeUser        string
-	KubePassword    string
+	User         string
+	KubeUser     string
+	KubePassword string
 
 	CACert     []byte
 	ClientCert []byte
@@ -86,14 +85,8 @@ func (c *KubeconfigBuilder) BuildRestConfig() (*rest.Config, error) {
 	restConfig.CAData = c.CACert
 	restConfig.CertData = c.ClientCert
 	restConfig.KeyData = c.ClientKey
-
-	// username/password or bearer token may be set, but not both
-	if c.KubeBearerToken != "" {
-		restConfig.BearerToken = c.KubeBearerToken
-	} else {
-		restConfig.Username = c.KubeUser
-		restConfig.Password = c.KubePassword
-	}
+	restConfig.Username = c.KubeUser
+	restConfig.Password = c.KubePassword
 
 	return restConfig, nil
 }
@@ -130,9 +123,7 @@ func (b *KubeconfigBuilder) WriteKubecfg(configAccess clientcmd.ConfigAccess) er
 			authInfo = clientcmdapi.NewAuthInfo()
 		}
 
-		if b.KubeBearerToken != "" {
-			authInfo.Token = b.KubeBearerToken
-		} else if b.KubeUser != "" && b.KubePassword != "" {
+		if b.KubeUser != "" && b.KubePassword != "" {
 			authInfo.Username = b.KubeUser
 			authInfo.Password = b.KubePassword
 		}