kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-06-11 17:12:51 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #2832 from Shell32-Natsu/fix-cmdxargs

Browse Source 
Fix IsFieldEmpty in cmdxargs
This commit is contained in:
Jeff Regan
2020-08-11 16:39:46 -07:00
committed by GitHub
parent 9be38e815e ff5051711f
commit fd5eeb1645
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/config/go.mod
View File

@@ -17,3 +17,5 @@ require (
sigs.k8s.io/cli-utils v0.17.0 sigs.k8s.io/cli-utils v0.17.0
sigs.k8s.io/kustomize/kyaml v0.5.0 sigs.k8s.io/kustomize/kyaml v0.5.0
) )
replace sigs.k8s.io/kustomize/kyaml v0.5.0 => ../../kyaml

4
cmd/config/internal/commands/cmdxargs.go
View File

@@ -177,13 +177,13 @@ func (r *XArgsRunner) runE(c *cobra.Command, _ []string) error {
} }
if r.WrapKind != "" { if r.WrapKind != "" {
if kind := rw.FunctionConfig.Field("kind"); !yaml.IsFieldEmpty(kind) { if kind := rw.FunctionConfig.Field("kind"); !kind.IsNilOrEmpty() {
kind.Value.YNode().Value = r.WrapKind kind.Value.YNode().Value = r.WrapKind
} }
rw.WrappingKind = r.WrapKind rw.WrappingKind = r.WrapKind
} }
if r.WrapVersion != "" { if r.WrapVersion != "" {
if version := rw.FunctionConfig.Field("apiVersion"); !yaml.IsFieldEmpty(version) { if version := rw.FunctionConfig.Field("apiVersion"); !version.IsNilOrEmpty() {
version.Value.YNode().Value = r.WrapVersion version.Value.YNode().Value = r.WrapVersion
} }
rw.WrappingAPIVersion = r.WrapVersion rw.WrappingAPIVersion = r.WrapVersion

1
kustomize/go.mod
View File

@@ -15,6 +15,7 @@ require (
replace ( replace (
sigs.k8s.io/kustomize/api v0.5.1 => ../api sigs.k8s.io/kustomize/api v0.5.1 => ../api
sigs.k8s.io/kustomize/cmd/config v0.5.0 => ../cmd/config sigs.k8s.io/kustomize/cmd/config v0.5.0 => ../cmd/config
sigs.k8s.io/kustomize/kyaml => ../kyaml
) )
exclude ( exclude (