diff --git a/api/go.mod b/api/go.mod index 6989995dc..52b0fc84f 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.19 + sigs.k8s.io/kustomize/kyaml v0.10.20 sigs.k8s.io/yaml v1.2.0 ) replace gopkg.in/yaml.v3 => gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c - -replace sigs.k8s.io/kustomize/kyaml => ../kyaml diff --git a/api/go.sum b/api/go.sum index 37df0fd6c..9732c60a0 100644 --- a/api/go.sum +++ b/api/go.sum @@ -224,6 +224,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.20 h1:L9JNKvJfCBpmYFr4tP0igpfj/pXP7nW2aXOWNtF5k1g= +sigs.k8s.io/kustomize/kyaml v0.10.20/go.mod h1:TYWhGwW9vjoRh3rWqBwB/ZOXyEGRVWe7Ggc3+KZIO+c= 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 ea2b0d20d..6a1494bb8 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.19 + sigs.k8s.io/kustomize/kyaml v0.10.20 ) replace gopkg.in/yaml.v3 => gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c - -replace sigs.k8s.io/kustomize/kyaml => ../../kyaml diff --git a/cmd/config/go.sum b/cmd/config/go.sum index 8fc6cbf50..ec1f0e30d 100644 --- a/cmd/config/go.sum +++ b/cmd/config/go.sum @@ -244,5 +244,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.20 h1:L9JNKvJfCBpmYFr4tP0igpfj/pXP7nW2aXOWNtF5k1g= +sigs.k8s.io/kustomize/kyaml v0.10.20/go.mod h1:TYWhGwW9vjoRh3rWqBwB/ZOXyEGRVWe7Ggc3+KZIO+c= 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 a9a28b472..96303ac29 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.9 - sigs.k8s.io/kustomize/kyaml v0.10.19 + sigs.k8s.io/kustomize/kyaml v0.10.20 ) -replace sigs.k8s.io/kustomize/kyaml => ../../kyaml - replace sigs.k8s.io/kustomize/api => ../../api diff --git a/cmd/pluginator/go.sum b/cmd/pluginator/go.sum index 1af985dfb..09a6f5fcb 100644 --- a/cmd/pluginator/go.sum +++ b/cmd/pluginator/go.sum @@ -229,6 +229,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.20 h1:L9JNKvJfCBpmYFr4tP0igpfj/pXP7nW2aXOWNtF5k1g= +sigs.k8s.io/kustomize/kyaml v0.10.20/go.mod h1:TYWhGwW9vjoRh3rWqBwB/ZOXyEGRVWe7Ggc3+KZIO+c= 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 a69852b87..add14e55d 100644 --- a/kustomize/go.mod +++ b/kustomize/go.mod @@ -10,7 +10,7 @@ require ( github.com/stretchr/testify v1.7.0 sigs.k8s.io/kustomize/api v0.8.9 sigs.k8s.io/kustomize/cmd/config v0.9.11 - sigs.k8s.io/kustomize/kyaml v0.10.19 + sigs.k8s.io/kustomize/kyaml v0.10.20 sigs.k8s.io/yaml v1.2.0 ) @@ -19,8 +19,6 @@ exclude ( sigs.k8s.io/kustomize/cmd/config v0.2.0 ) -replace sigs.k8s.io/kustomize/kyaml => ../kyaml - replace sigs.k8s.io/kustomize/cmd/config => ../cmd/config replace sigs.k8s.io/kustomize/api => ../api diff --git a/kustomize/go.sum b/kustomize/go.sum index 528d2e771..2fefcbae9 100644 --- a/kustomize/go.sum +++ b/kustomize/go.sum @@ -253,6 +253,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.20 h1:L9JNKvJfCBpmYFr4tP0igpfj/pXP7nW2aXOWNtF5k1g= +sigs.k8s.io/kustomize/kyaml v0.10.20/go.mod h1:TYWhGwW9vjoRh3rWqBwB/ZOXyEGRVWe7Ggc3+KZIO+c= 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/prefixsuffixtransformer/go.mod b/plugin/builtin/prefixsuffixtransformer/go.mod index 83f2a6581..2125c9ed7 100644 --- a/plugin/builtin/prefixsuffixtransformer/go.mod +++ b/plugin/builtin/prefixsuffixtransformer/go.mod @@ -4,10 +4,11 @@ go 1.16 require ( sigs.k8s.io/kustomize/api v0.8.9 - sigs.k8s.io/kustomize/kyaml v0.10.19 + sigs.k8s.io/kustomize/kyaml v0.10.20 sigs.k8s.io/yaml v1.2.0 ) replace sigs.k8s.io/kustomize/kyaml => ../../../kyaml replace sigs.k8s.io/kustomize/api => ../../../api + diff --git a/plugin/builtin/replicacounttransformer/go.mod b/plugin/builtin/replicacounttransformer/go.mod index 3c5dca735..029c29f74 100644 --- a/plugin/builtin/replicacounttransformer/go.mod +++ b/plugin/builtin/replicacounttransformer/go.mod @@ -4,10 +4,11 @@ go 1.16 require ( sigs.k8s.io/kustomize/api v0.8.9 - sigs.k8s.io/kustomize/kyaml v0.10.19 + sigs.k8s.io/kustomize/kyaml v0.10.20 sigs.k8s.io/yaml v1.2.0 ) replace sigs.k8s.io/kustomize/kyaml => ../../../kyaml replace sigs.k8s.io/kustomize/api => ../../../api +