From 51268a5f0655e340b74b6379bf93bd3c66ca50a2 Mon Sep 17 00:00:00 2001 From: Donny Xia Date: Tue, 11 Aug 2020 16:11:23 -0700 Subject: [PATCH 1/2] Fix IsFieldEmpty in cmdxargs --- cmd/config/go.mod | 2 ++ cmd/config/internal/commands/cmdxargs.go | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cmd/config/go.mod b/cmd/config/go.mod index 2ab6cfec7..d6df9db6a 100644 --- a/cmd/config/go.mod +++ b/cmd/config/go.mod @@ -17,3 +17,5 @@ require ( sigs.k8s.io/cli-utils v0.17.0 sigs.k8s.io/kustomize/kyaml v0.5.0 ) + +replace sigs.k8s.io/kustomize/kyaml v0.5.0 => ../../kyaml diff --git a/cmd/config/internal/commands/cmdxargs.go b/cmd/config/internal/commands/cmdxargs.go index d974d06b2..3f2ea7bad 100644 --- a/cmd/config/internal/commands/cmdxargs.go +++ b/cmd/config/internal/commands/cmdxargs.go @@ -177,13 +177,13 @@ func (r *XArgsRunner) runE(c *cobra.Command, _ []string) error { } 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 } rw.WrappingKind = r.WrapKind } 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 } rw.WrappingAPIVersion = r.WrapVersion From ff5051711fc30f314e376bddc69e7663fd866ed5 Mon Sep 17 00:00:00 2001 From: Donny Xia Date: Tue, 11 Aug 2020 16:21:50 -0700 Subject: [PATCH 2/2] fix test failure --- kustomize/go.mod | 1 + 1 file changed, 1 insertion(+) diff --git a/kustomize/go.mod b/kustomize/go.mod index 9b9443add..74cc82e42 100644 --- a/kustomize/go.mod +++ b/kustomize/go.mod @@ -15,6 +15,7 @@ require ( replace ( sigs.k8s.io/kustomize/api v0.5.1 => ../api sigs.k8s.io/kustomize/cmd/config v0.5.0 => ../cmd/config + sigs.k8s.io/kustomize/kyaml => ../kyaml ) exclude (