diff --git a/api/builtins/PatchTransformer.go b/api/builtins/PatchTransformer.go index 99f48e748..e9a3bbdbd 100644 --- a/api/builtins/PatchTransformer.go +++ b/api/builtins/PatchTransformer.go @@ -76,10 +76,9 @@ func (p *PatchTransformerPlugin) Config( func (p *PatchTransformerPlugin) Transform(m resmap.ResMap) error { if p.loadedPatch == nil { return p.transformJson6902(m, p.decodedPatch) - } else { - // The patch was a strategic merge patch - return p.transformStrategicMerge(m, p.loadedPatch) } + // The patch was a strategic merge patch + return p.transformStrategicMerge(m, p.loadedPatch) } // transformStrategicMerge applies the provided strategic merge patch diff --git a/api/go.mod b/api/go.mod index 59bfea385..43e639ac1 100644 --- a/api/go.mod +++ b/api/go.mod @@ -11,10 +11,8 @@ require ( github.com/stretchr/testify v1.5.1 gopkg.in/yaml.v2 v2.4.0 k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e - sigs.k8s.io/kustomize/kyaml v0.10.17 + sigs.k8s.io/kustomize/kyaml v0.10.18 sigs.k8s.io/yaml v1.2.0 ) -replace sigs.k8s.io/kustomize/kyaml => ../kyaml - replace gopkg.in/yaml.v3 => gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c diff --git a/api/go.sum b/api/go.sum index 5fef24d60..18ee1e2de 100644 --- a/api/go.sum +++ b/api/go.sum @@ -227,6 +227,8 @@ k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8 k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e h1:KLHHjkdQFomZy8+06csTWZ0m1343QqxZhR2LJ1OxCYM= k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= +sigs.k8s.io/kustomize/kyaml v0.10.18 h1:Cuf4KiVULTttfo/2Vls2H9fA7eH8Xll1w6RgGdL+tR8= +sigs.k8s.io/kustomize/kyaml v0.10.18/go.mod h1:h94DSoDbmnN4BTc6VTX7tGNGXZy29rbPo+R4jGMvA8U= sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= diff --git a/cmd/config/go.mod b/cmd/config/go.mod index 53adbba25..85d8d824a 100644 --- a/cmd/config/go.mod +++ b/cmd/config/go.mod @@ -16,9 +16,7 @@ require ( gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect gopkg.in/inf.v0 v0.9.1 k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e - sigs.k8s.io/kustomize/kyaml v0.10.17 + sigs.k8s.io/kustomize/kyaml v0.10.18 ) -replace sigs.k8s.io/kustomize/kyaml => ../../kyaml - replace gopkg.in/yaml.v3 => gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c diff --git a/cmd/config/go.sum b/cmd/config/go.sum index ab1fdf4b2..f3a1c916a 100644 --- a/cmd/config/go.sum +++ b/cmd/config/go.sum @@ -247,5 +247,7 @@ k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8 k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e h1:KLHHjkdQFomZy8+06csTWZ0m1343QqxZhR2LJ1OxCYM= k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= +sigs.k8s.io/kustomize/kyaml v0.10.18 h1:Cuf4KiVULTttfo/2Vls2H9fA7eH8Xll1w6RgGdL+tR8= +sigs.k8s.io/kustomize/kyaml v0.10.18/go.mod h1:h94DSoDbmnN4BTc6VTX7tGNGXZy29rbPo+R4jGMvA8U= sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= diff --git a/cmd/pluginator/go.mod b/cmd/pluginator/go.mod index 676393edc..9956b3b15 100644 --- a/cmd/pluginator/go.mod +++ b/cmd/pluginator/go.mod @@ -7,9 +7,7 @@ require ( github.com/spf13/cobra v1.0.0 github.com/stretchr/testify v1.5.1 sigs.k8s.io/kustomize/api v0.8.8 - sigs.k8s.io/kustomize/kyaml v0.10.17 + sigs.k8s.io/kustomize/kyaml v0.10.18 ) replace sigs.k8s.io/kustomize/api => ../../api - -replace sigs.k8s.io/kustomize/kyaml => ../../kyaml diff --git a/cmd/pluginator/go.sum b/cmd/pluginator/go.sum index c22eb6b1a..e2a756710 100644 --- a/cmd/pluginator/go.sum +++ b/cmd/pluginator/go.sum @@ -230,6 +230,8 @@ k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8 k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e h1:KLHHjkdQFomZy8+06csTWZ0m1343QqxZhR2LJ1OxCYM= k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= +sigs.k8s.io/kustomize/kyaml v0.10.18 h1:Cuf4KiVULTttfo/2Vls2H9fA7eH8Xll1w6RgGdL+tR8= +sigs.k8s.io/kustomize/kyaml v0.10.18/go.mod h1:h94DSoDbmnN4BTc6VTX7tGNGXZy29rbPo+R4jGMvA8U= sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= diff --git a/kustomize/go.mod b/kustomize/go.mod index ff366a6d6..2a9d38731 100644 --- a/kustomize/go.mod +++ b/kustomize/go.mod @@ -9,7 +9,7 @@ require ( github.com/spf13/pflag v1.0.5 sigs.k8s.io/kustomize/api v0.8.8 sigs.k8s.io/kustomize/cmd/config v0.9.10 - sigs.k8s.io/kustomize/kyaml v0.10.17 + sigs.k8s.io/kustomize/kyaml v0.10.18 sigs.k8s.io/yaml v1.2.0 ) @@ -21,5 +21,3 @@ exclude ( replace sigs.k8s.io/kustomize/api => ../api replace sigs.k8s.io/kustomize/cmd/config => ../cmd/config - -replace sigs.k8s.io/kustomize/kyaml => ../kyaml diff --git a/kustomize/go.sum b/kustomize/go.sum index 66c5127ca..75f40fa04 100644 --- a/kustomize/go.sum +++ b/kustomize/go.sum @@ -255,6 +255,8 @@ k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8 k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e h1:KLHHjkdQFomZy8+06csTWZ0m1343QqxZhR2LJ1OxCYM= k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= +sigs.k8s.io/kustomize/kyaml v0.10.18 h1:Cuf4KiVULTttfo/2Vls2H9fA7eH8Xll1w6RgGdL+tR8= +sigs.k8s.io/kustomize/kyaml v0.10.18/go.mod h1:h94DSoDbmnN4BTc6VTX7tGNGXZy29rbPo+R4jGMvA8U= sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= diff --git a/plugin/builtin/replacementtransformer/go.mod b/plugin/builtin/replacementtransformer/go.mod index 9383b4025..2e8c7d5ac 100644 --- a/plugin/builtin/replacementtransformer/go.mod +++ b/plugin/builtin/replacementtransformer/go.mod @@ -4,7 +4,7 @@ go 1.16 require ( sigs.k8s.io/kustomize/api v0.0.0 - sigs.k8s.io/kustomize/kyaml v0.10.17 + sigs.k8s.io/kustomize/kyaml v0.10.18 sigs.k8s.io/yaml v1.2.0 )