From aa92d83d8c399d7b4df18ac0483eb72e8f2ad255 Mon Sep 17 00:00:00 2001 From: Katrina Verey Date: Wed, 30 Jun 2021 14:59:03 -0400 Subject: [PATCH] Pin to kyaml (#4020) * Pin to kyaml * Pin prefixsuffixtransformer to kyaml 0.11.0 * Pin replicacounttransformer to kyaml 0.11.0 --- api/go.mod | 4 +--- api/go.sum | 2 ++ cmd/config/go.mod | 4 +--- cmd/config/go.sum | 2 ++ cmd/pluginator/go.mod | 4 +--- cmd/pluginator/go.sum | 2 ++ kustomize/go.mod | 4 +--- kustomize/go.sum | 2 ++ plugin/builtin/prefixsuffixtransformer/go.mod | 2 +- plugin/builtin/replicacounttransformer/go.mod | 2 +- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/api/go.mod b/api/go.mod index bce9e6180..a791ea561 100644 --- a/api/go.mod +++ b/api/go.mod @@ -11,8 +11,6 @@ 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.20 + sigs.k8s.io/kustomize/kyaml v0.11.0 sigs.k8s.io/yaml v1.2.0 ) - -replace sigs.k8s.io/kustomize/kyaml => ../kyaml diff --git a/api/go.sum b/api/go.sum index 5055de671..37b5402ba 100644 --- a/api/go.sum +++ b/api/go.sum @@ -223,6 +223,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.11.0 h1:9KhiCPKaVyuPcgOLJXkvytOvjMJLoxpjodiycb4gHsA= +sigs.k8s.io/kustomize/kyaml v0.11.0/go.mod h1:GNMwjim4Ypgp/MueD3zXHLRJEjz7RvtPae0AwlvEMFM= 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 cc78147b4..763f707d5 100644 --- a/cmd/config/go.mod +++ b/cmd/config/go.mod @@ -16,7 +16,5 @@ 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.20 + sigs.k8s.io/kustomize/kyaml v0.11.0 ) - -replace sigs.k8s.io/kustomize/kyaml => ../../kyaml diff --git a/cmd/config/go.sum b/cmd/config/go.sum index 06b87c52d..7779ee41a 100644 --- a/cmd/config/go.sum +++ b/cmd/config/go.sum @@ -245,5 +245,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.11.0 h1:9KhiCPKaVyuPcgOLJXkvytOvjMJLoxpjodiycb4gHsA= +sigs.k8s.io/kustomize/kyaml v0.11.0/go.mod h1:GNMwjim4Ypgp/MueD3zXHLRJEjz7RvtPae0AwlvEMFM= 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 40cbe0bee..5aa30adcb 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.10 - sigs.k8s.io/kustomize/kyaml v0.10.20 + sigs.k8s.io/kustomize/kyaml v0.11.0 ) 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 0e31bbef8..1aa7ffaac 100644 --- a/cmd/pluginator/go.sum +++ b/cmd/pluginator/go.sum @@ -228,6 +228,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.11.0 h1:9KhiCPKaVyuPcgOLJXkvytOvjMJLoxpjodiycb4gHsA= +sigs.k8s.io/kustomize/kyaml v0.11.0/go.mod h1:GNMwjim4Ypgp/MueD3zXHLRJEjz7RvtPae0AwlvEMFM= 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 630041c5f..59581999b 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.10 sigs.k8s.io/kustomize/cmd/config v0.9.12 - sigs.k8s.io/kustomize/kyaml v0.10.20 + sigs.k8s.io/kustomize/kyaml v0.11.0 sigs.k8s.io/yaml v1.2.0 ) @@ -22,5 +22,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 fe1c14ed8..35ebb60f1 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.11.0 h1:9KhiCPKaVyuPcgOLJXkvytOvjMJLoxpjodiycb4gHsA= +sigs.k8s.io/kustomize/kyaml v0.11.0/go.mod h1:GNMwjim4Ypgp/MueD3zXHLRJEjz7RvtPae0AwlvEMFM= 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 4f937f634..337a842c7 100644 --- a/plugin/builtin/prefixsuffixtransformer/go.mod +++ b/plugin/builtin/prefixsuffixtransformer/go.mod @@ -4,7 +4,7 @@ go 1.16 require ( sigs.k8s.io/kustomize/api v0.8.9 - sigs.k8s.io/kustomize/kyaml v0.10.20 + sigs.k8s.io/kustomize/kyaml v0.11.0 sigs.k8s.io/yaml v1.2.0 ) diff --git a/plugin/builtin/replicacounttransformer/go.mod b/plugin/builtin/replicacounttransformer/go.mod index 0ac1deaa6..51d2de58e 100644 --- a/plugin/builtin/replicacounttransformer/go.mod +++ b/plugin/builtin/replicacounttransformer/go.mod @@ -4,7 +4,7 @@ go 1.16 require ( sigs.k8s.io/kustomize/api v0.8.9 - sigs.k8s.io/kustomize/kyaml v0.10.20 + sigs.k8s.io/kustomize/kyaml v0.11.0 sigs.k8s.io/yaml v1.2.0 )