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

Merge pull request #42948 from CaoShuFeng/fromLiteralStrings

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 42998, 42902, 42959, 43020, 42948)

[cli] fix Generator's error messages

Invalid variables are used when format error messages. This change
fixes them.

**Release note**:

```NONE
```
This commit is contained in:
Kubernetes Submit Queue 2017-03-25 17:17:28 -07:00 committed by GitHub
commit 6a529f700a
4 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/kubectl/clusterrolebinding.go
View File

@ -52,29 +52,29 @@ func (s ClusterRoleBindingGeneratorV1) Generate(genericParams map[string]interfa
return nil, err
}
delegate := &ClusterRoleBindingGeneratorV1{}
fromFileStrings, found := genericParams["user"]
userStrings, found := genericParams["user"]
if found {
fromFileArray, isArray := fromFileStrings.([]string)
fromFileArray, isArray := userStrings.([]string)
if !isArray {
return nil, fmt.Errorf("expected []string, found :%v", fromFileStrings)
return nil, fmt.Errorf("expected []string, found :%v", userStrings)
}
delegate.Users = fromFileArray
delete(genericParams, "user")
}
fromLiteralStrings, found := genericParams["group"]
groupStrings, found := genericParams["group"]
if found {
fromLiteralArray, isArray := fromLiteralStrings.([]string)
fromLiteralArray, isArray := groupStrings.([]string)
if !isArray {
return nil, fmt.Errorf("expected []string, found :%v", fromFileStrings)
return nil, fmt.Errorf("expected []string, found :%v", groupStrings)
}
delegate.Groups = fromLiteralArray
delete(genericParams, "group")
}
fromSAStrings, found := genericParams["serviceaccount"]
saStrings, found := genericParams["serviceaccount"]
if found {
fromLiteralArray, isArray := fromSAStrings.([]string)
fromLiteralArray, isArray := saStrings.([]string)
if !isArray {
return nil, fmt.Errorf("expected []string, found :%v", fromFileStrings)
return nil, fmt.Errorf("expected []string, found :%v", saStrings)
}
delegate.ServiceAccounts = fromLiteralArray
delete(genericParams, "serviceaccount")

2
pkg/kubectl/configmap.go
View File

@ -68,7 +68,7 @@ func (s ConfigMapGeneratorV1) Generate(genericParams map[string]interface{}) (ru
if found {
fromLiteralArray, isArray := fromLiteralStrings.([]string)
if !isArray {
return nil, fmt.Errorf("expected []string, found :%v", fromFileStrings)
return nil, fmt.Errorf("expected []string, found :%v", fromLiteralStrings)
}
delegate.LiteralSources = fromLiteralArray
delete(genericParams, "from-literal")

18
pkg/kubectl/rolebinding.go
View File

@ -54,29 +54,29 @@ func (s RoleBindingGeneratorV1) Generate(genericParams map[string]interface{}) (
return nil, err
}
delegate := &RoleBindingGeneratorV1{}
fromFileStrings, found := genericParams["user"]
userStrings, found := genericParams["user"]
if found {
fromFileArray, isArray := fromFileStrings.([]string)
fromFileArray, isArray := userStrings.([]string)
if !isArray {
return nil, fmt.Errorf("expected []string, found :%v", fromFileStrings)
return nil, fmt.Errorf("expected []string, found :%v", userStrings)
}
delegate.Users = fromFileArray
delete(genericParams, "user")
}
fromLiteralStrings, found := genericParams["group"]
groupStrings, found := genericParams["group"]
if found {
fromLiteralArray, isArray := fromLiteralStrings.([]string)
fromLiteralArray, isArray := groupStrings.([]string)
if !isArray {
return nil, fmt.Errorf("expected []string, found :%v", fromFileStrings)
return nil, fmt.Errorf("expected []string, found :%v", groupStrings)
}
delegate.Groups = fromLiteralArray
delete(genericParams, "group")
}
fromSAStrings, found := genericParams["serviceaccount"]
saStrings, found := genericParams["serviceaccount"]
if found {
fromLiteralArray, isArray := fromSAStrings.([]string)
fromLiteralArray, isArray := saStrings.([]string)
if !isArray {
return nil, fmt.Errorf("expected []string, found :%v", fromFileStrings)
return nil, fmt.Errorf("expected []string, found :%v", saStrings)
}
delegate.ServiceAccounts = fromLiteralArray
delete(genericParams, "serviceaccount")

2
pkg/kubectl/secret.go
View File

@ -68,7 +68,7 @@ func (s SecretGeneratorV1) Generate(genericParams map[string]interface{}) (runti
if found {
fromLiteralArray, isArray := fromLiteralStrings.([]string)
if !isArray {
return nil, fmt.Errorf("expected []string, found :%v", fromFileStrings)
return nil, fmt.Errorf("expected []string, found :%v", fromLiteralStrings)
}
delegate.LiteralSources = fromLiteralArray
delete(genericParams, "from-literal")