github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #40999 from xingzhou/tiny-bug

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 40385, 40786, 40999, 41026, 40996)

Fixed a tiny bug on using RoleBindingGenerator

Fixed a typo bug while using RoleBindingGenerator, this
bug causes error when binding role to service accounts
through "kubectl create rolebinding" command.
This commit is contained in:
Kubernetes Submit Queue 2017-02-06 16:51:08 -08:00 committed by GitHub
commit e0db0932a7
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubectl/clusterrolebinding.go
View File

@ -77,7 +77,7 @@ func (s ClusterRoleBindingGeneratorV1) Generate(genericParams map[string]interfa
return nil, fmt.Errorf("expected []string, found :%v", fromFileStrings) return nil, fmt.Errorf("expected []string, found :%v", fromFileStrings)
} }
delegate.ServiceAccounts = fromLiteralArray delegate.ServiceAccounts = fromLiteralArray
delete(genericParams, "serviceaccounts") delete(genericParams, "serviceaccount")
} }
params := map[string]string{} params := map[string]string{}
for key, value := range genericParams { for key, value := range genericParams {

2
pkg/kubectl/rolebinding.go
View File

@ -79,7 +79,7 @@ func (s RoleBindingGeneratorV1) Generate(genericParams map[string]interface{}) (
return nil, fmt.Errorf("expected []string, found :%v", fromFileStrings) return nil, fmt.Errorf("expected []string, found :%v", fromFileStrings)
} }
delegate.ServiceAccounts = fromLiteralArray delegate.ServiceAccounts = fromLiteralArray
delete(genericParams, "serviceaccounts") delete(genericParams, "serviceaccount")
} }
params := map[string]string{} params := map[string]string{}
for key, value := range genericParams { for key, value := range genericParams {