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

Merge pull request #88985 from brianpursley/kubectl-667 

Changed kubectl config view to redact user token

Kubernetes-commit: 4bc907f3c956ffb808fdcfb4f8fc07825b8d2339
This commit is contained in:
Kubernetes Publisher 2020-03-18 09:22:48 -07:00
parent 9a3954bf65 1a80e2e210
commit 9156367cc2
5 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Godeps/Godeps.json generated
View File

@ -568,11 +568,11 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "b3bd583303d6"
"Rev": "c322e7106b58"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "2b7fa1cb5395"
"Rev": "1a505bc60c6d"
},
{
"ImportPath": "k8s.io/cli-runtime",
@ -580,7 +580,7 @@
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "5194bac86967"
"Rev": "2b32f6d21530"
},
{
"ImportPath": "k8s.io/code-generator",

12
go.mod
View File

@ -37,10 +37,10 @@ require (
golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7
gopkg.in/yaml.v2 v2.2.8
gotest.tools v2.2.0+incompatible // indirect
k8s.io/api v0.0.0-20200309160345-b3bd583303d6
k8s.io/apimachinery v0.0.0-20200307122051-2b7fa1cb5395
k8s.io/api v0.0.0-20200318082330-c322e7106b58
k8s.io/apimachinery v0.0.0-20200318002310-1a505bc60c6d
k8s.io/cli-runtime v0.0.0-20200307124427-99b536c4b997
k8s.io/client-go v0.0.0-20200307122516-5194bac86967
k8s.io/client-go v0.0.0-20200318202604-2b32f6d21530
k8s.io/component-base v0.0.0-20200307123030-dae26a37dccb
k8s.io/klog v1.0.0
k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c
@ -54,10 +54,10 @@ require (
replace (
golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a // pinned to release-branch.go1.13
golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 // pinned to release-branch.go1.13
k8s.io/api => k8s.io/api v0.0.0-20200309160345-b3bd583303d6
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200307122051-2b7fa1cb5395
k8s.io/api => k8s.io/api v0.0.0-20200318082330-c322e7106b58
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200318002310-1a505bc60c6d
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20200307124427-99b536c4b997
k8s.io/client-go => k8s.io/client-go v0.0.0-20200307122516-5194bac86967
k8s.io/client-go => k8s.io/client-go v0.0.0-20200318202604-2b32f6d21530
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200306081859-6a048a382944
k8s.io/component-base => k8s.io/component-base v0.0.0-20200307123030-dae26a37dccb
k8s.io/metrics => k8s.io/metrics v0.0.0-20200307124303-6bbd5186ca94

6
go.sum
View File

@ -306,10 +306,10 @@ gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
k8s.io/api v0.0.0-20200309160345-b3bd583303d6/go.mod h1:4LcBtPb1OoMEmTvQLypv2jGrtMEK8ZRCPQyc+uOSi4o=
k8s.io/apimachinery v0.0.0-20200307122051-2b7fa1cb5395/go.mod h1:9SnR/e11v5IbyPCGbvJViimtJ0SwHG4nfZFjU77ftcA=
k8s.io/api v0.0.0-20200318082330-c322e7106b58/go.mod h1:fgdqjKzHnQk8FgQap4oF+mCZZ5mDwocerdaTl5NaXLQ=
k8s.io/apimachinery v0.0.0-20200318002310-1a505bc60c6d/go.mod h1:9SnR/e11v5IbyPCGbvJViimtJ0SwHG4nfZFjU77ftcA=
k8s.io/cli-runtime v0.0.0-20200307124427-99b536c4b997/go.mod h1:/iZjMCD5/3wfEqXl8DAqo58AJtq+BlFyUJOQUw3eeiw=
k8s.io/client-go v0.0.0-20200307122516-5194bac86967/go.mod h1:Ys+cjVY1SiB17qdMz+qc3ItvCfnYLsgVt49tSUmvwTo=
k8s.io/client-go v0.0.0-20200318202604-2b32f6d21530/go.mod h1:ICkH5j1IytD7G6RUU9t1bzcXaY4tRlzq8HMoNpryCHU=
k8s.io/code-generator v0.0.0-20200306081859-6a048a382944/go.mod h1:+UHX5rSbxmR8kzS+FAv7um6dtYrZokQvjHpDSYRVkTc=
k8s.io/component-base v0.0.0-20200307123030-dae26a37dccb/go.mod h1:P8U3GgtuxIyAFY/al0ojd2AP/ifHmYMZBx3HFO3N0es=
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=

2
pkg/cmd/config/config_test.go
View File

@ -72,7 +72,7 @@ func Example_view() {
// users:
// - name: red-user
// user:
// token: red-token
// token: REDACTED
}
func TestCurrentContext(t *testing.T) {

16
pkg/cmd/config/view_test.go
View File

@ -48,8 +48,8 @@ func TestViewCluster(t *testing.T) {
},
CurrentContext: "minikube",
AuthInfos: map[string]*clientcmdapi.AuthInfo{
"minikube": {Token: "minikube-token"},
"mu-cluster": {Token: "minikube-token"},
"minikube": {Token: "REDACTED"},
"mu-cluster": {Token: "REDACTED"},
},
}
@ -79,10 +79,10 @@ preferences: {}
users:
- name: minikube
user:
token: minikube-token
token: REDACTED
- name: mu-cluster
user:
token: minikube-token` + "\n",
token: REDACTED` + "\n",
}
test.run(t)
@ -103,8 +103,8 @@ func TestViewClusterMinify(t *testing.T) {
},
CurrentContext: "minikube",
AuthInfos: map[string]*clientcmdapi.AuthInfo{
"minikube": {Token: "minikube-token"},
"mu-cluster": {Token: "minikube-token"},
"minikube": {Token: "REDACTED"},
"mu-cluster": {Token: "REDACTED"},
},
}
@ -134,7 +134,7 @@ preferences: {}
users:
- name: minikube
user:
token: minikube-token` + "\n",
token: REDACTED` + "\n",
},
{
description: "Testing for kubectl config view --minify=true --context=my-cluster",
@ -156,7 +156,7 @@ preferences: {}
users:
- name: mu-cluster
user:
token: minikube-token` + "\n",
token: REDACTED` + "\n",
},
}