kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-06-14 02:20:53 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Fix cmd/config windows issues

Browse Source
This commit is contained in:
Phillip Wittrock
2020-05-20 16:11:08 -07:00
parent d616c9c315
commit 28c919912a
10 changed files with 84 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
kyaml/fn/runtime/runtimeutil/functiontypes.go
View File

@@ -5,6 +5,7 @@ package runtimeutil
import (
"fmt"
"os"
"strings"
"sigs.k8s.io/kustomize/kyaml/yaml"
@@ -121,7 +122,10 @@ func getFunctionSpecFromAnnotation(n *yaml.RNode, meta yaml.ResourceMeta) *Funct
for _, s := range functionAnnotationKeys {
fn := meta.Annotations[s]
if fn != "" {
_ = yaml.Unmarshal([]byte(fn), &fs)
err := yaml.Unmarshal([]byte(fn), &fs)
if err != nil {
fmt.Fprintf(os.Stderr, "%v\n", err)
}
return &fs
}
}
@@ -131,9 +135,12 @@ func getFunctionSpecFromAnnotation(n *yaml.RNode, meta yaml.ResourceMeta) *Funct
}
s, err := n.String()
if err != nil {
return nil
fmt.Fprintf(os.Stderr, "%v\n", err)
}
err = yaml.Unmarshal([]byte(s), &fs)
if err != nil {
fmt.Fprintf(os.Stderr, "%v\n", err)
}
_ = yaml.Unmarshal([]byte(s), &fs)
return &fs
}