github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-04 15:05:20 +00:00
Code Issues Projects Releases Wiki Activity

Upgrade kustomize-in-kubectl to v4.2.0

Browse Source
This commit is contained in:
Natasha Sarkar
2021-07-01 17:10:47 -07:00
parent a46b42a92b
commit 6d4096cc69
85 changed files with 12359 additions and 407 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
vendor/sigs.k8s.io/kustomize/api/internal/generators/configmap.go generated vendored
View File

@@ -40,7 +40,13 @@ func MakeConfigMap(
if err = rn.LoadMapIntoConfigMapData(m); err != nil {
return nil, err
}
copyLabelsAndAnnotations(rn, args.Options)
setImmutable(rn, args.Options)
err = copyLabelsAndAnnotations(rn, args.Options)
if err != nil {
return nil, err
}
err = setImmutable(rn, args.Options)
if err != nil {
return nil, err
}
return rn, nil
}