Skip to content

K
k3s
Commit e0db0932 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #40999 from xingzhou/tiny-bug

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.
parents a09c0796 8db1cfc2
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
pkg/kubectl/clusterrolebinding.go
View file @ e0db0932
...@@ -77,7 +77,7 @@ func (s ClusterRoleBindingGeneratorV1) Generate(genericParams map[string]interfa ...@@ -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 {
......
pkg/kubectl/rolebinding.go
View file @ e0db0932
...@@ -79,7 +79,7 @@ func (s RoleBindingGeneratorV1) Generate(genericParams map[string]interface{}) ( ...@@ -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 {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment