github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-15 06:43:54 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #101780 from nak3/fix-create-cm

Browse Source 
Fix error handling for kubectl create configmap
This commit is contained in:
Kubernetes Prow Robot 2021-05-10 16:39:37 -07:00 committed by GitHub
commit 78df56def6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
staging/src/k8s.io/kubectl/pkg/cmd/create/create_configmap.go
View File

@ -215,7 +215,7 @@ func (o *ConfigMapOptions) Validate() error {
func (o *ConfigMapOptions) Run() error { func (o *ConfigMapOptions) Run() error {
configMap, err := o.createConfigMap() configMap, err := o.createConfigMap()
if err != nil { if err != nil {
return nil return err
} }
if err := util.CreateOrUpdateAnnotation(o.CreateAnnotation, configMap, scheme.DefaultJSONEncoder()); err != nil { if err := util.CreateOrUpdateAnnotation(o.CreateAnnotation, configMap, scheme.DefaultJSONEncoder()); err != nil {
return err return err