kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10181 from rifelpet/bearer-cleanup 

Remove unused bearer token field from kubeconfig builder
This commit is contained in:
Kubernetes Prow Robot 2020-11-06 12:04:30 -08:00 committed by GitHub
parent d13ae5ab36 aebe742291
commit 1200083400
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/kubeconfig/kubecfg_builder.go
View File

@ -34,7 +34,6 @@ type KubeconfigBuilder struct {
Namespace string Namespace string
User string User string
KubeBearerToken string
KubeUser string KubeUser string
KubePassword string KubePassword string
@ -86,14 +85,8 @@ func (c *KubeconfigBuilder) BuildRestConfig() (*rest.Config, error) {
restConfig.CAData = c.CACert restConfig.CAData = c.CACert
restConfig.CertData = c.ClientCert restConfig.CertData = c.ClientCert
restConfig.KeyData = c.ClientKey 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.Username = c.KubeUser
restConfig.Password = c.KubePassword restConfig.Password = c.KubePassword
}
return restConfig, nil return restConfig, nil
} }
@ -130,9 +123,7 @@ func (b *KubeconfigBuilder) WriteKubecfg(configAccess clientcmd.ConfigAccess) er
authInfo = clientcmdapi.NewAuthInfo() authInfo = clientcmdapi.NewAuthInfo()
} }
if b.KubeBearerToken != "" { if b.KubeUser != "" && b.KubePassword != "" {
authInfo.Token = b.KubeBearerToken
} else if b.KubeUser != "" && b.KubePassword != "" {
authInfo.Username = b.KubeUser authInfo.Username = b.KubeUser
authInfo.Password = b.KubePassword authInfo.Password = b.KubePassword
} }