From 0d05b0f574bf720e259e87ad643da503c37c44b0 Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Fri, 21 May 2021 03:16:46 -0700 Subject: [PATCH] Merge pull request #102193 from gautierdelorme/bump_kustomize upgrade kustomize to v4.1.3 Kubernetes-commit: abe209b086b67bc4ebb61a86f9b60bddda2438ff --- Godeps/Godeps.json | 80 ++++------------------------------------------ go.mod | 31 +++++++++--------- go.sum | 15 +++++++++ 3 files changed, 36 insertions(+), 90 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 6b9b72820..f5ec6b007 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -94,10 +94,6 @@ "ImportPath": "github.com/PuerkitoBio/urlesc", "Rev": "de5bf2ad4578" }, - { - "ImportPath": "github.com/agnivade/levenshtein", - "Rev": "v1.0.1" - }, { "ImportPath": "github.com/alecthomas/template", "Rev": "fb15b899a751" @@ -106,10 +102,6 @@ "ImportPath": "github.com/alecthomas/units", "Rev": "c3de453c63f4" }, - { - "ImportPath": "github.com/andreyvit/diff", - "Rev": "c7f18ee00883" - }, { "ImportPath": "github.com/armon/circbuf", "Rev": "bbbad097214e" @@ -226,10 +218,6 @@ "ImportPath": "github.com/docker/distribution", "Rev": "v2.7.1" }, - { - "ImportPath": "github.com/docker/go-units", - "Rev": "v0.4.0" - }, { "ImportPath": "github.com/docopt/docopt-go", "Rev": "ee0de3bc6815" @@ -282,10 +270,6 @@ "ImportPath": "github.com/ghodss/yaml", "Rev": "v1.0.0" }, - { - "ImportPath": "github.com/globalsign/mgo", - "Rev": "eeefdecb41b8" - }, { "ImportPath": "github.com/go-errors/errors", "Rev": "v1.0.1" @@ -310,14 +294,6 @@ "ImportPath": "github.com/go-logr/logr", "Rev": "v0.4.0" }, - { - "ImportPath": "github.com/go-openapi/analysis", - "Rev": "v0.19.5" - }, - { - "ImportPath": "github.com/go-openapi/errors", - "Rev": "v0.19.2" - }, { "ImportPath": "github.com/go-openapi/jsonpointer", "Rev": "v0.19.3" @@ -326,38 +302,14 @@ "ImportPath": "github.com/go-openapi/jsonreference", "Rev": "v0.19.3" }, - { - "ImportPath": "github.com/go-openapi/loads", - "Rev": "v0.19.4" - }, - { - "ImportPath": "github.com/go-openapi/runtime", - "Rev": "v0.19.4" - }, - { - "ImportPath": "github.com/go-openapi/spec", - "Rev": "v0.19.5" - }, - { - "ImportPath": "github.com/go-openapi/strfmt", - "Rev": "v0.19.5" - }, { "ImportPath": "github.com/go-openapi/swag", "Rev": "v0.19.5" }, - { - "ImportPath": "github.com/go-openapi/validate", - "Rev": "v0.19.8" - }, { "ImportPath": "github.com/go-stack/stack", "Rev": "v1.8.0" }, - { - "ImportPath": "github.com/gobuffalo/here", - "Rev": "v0.6.0" - }, { "ImportPath": "github.com/gogo/protobuf", "Rev": "v1.3.2" @@ -576,7 +528,7 @@ }, { "ImportPath": "github.com/kr/pty", - "Rev": "v1.1.5" + "Rev": "v1.1.1" }, { "ImportPath": "github.com/kr/text", @@ -598,10 +550,6 @@ "ImportPath": "github.com/mailru/easyjson", "Rev": "v0.7.0" }, - { - "ImportPath": "github.com/markbates/pkger", - "Rev": "v0.17.1" - }, { "ImportPath": "github.com/mattn/go-colorable", "Rev": "v0.0.9" @@ -714,10 +662,6 @@ "ImportPath": "github.com/pascaldekloe/goe", "Rev": "57f6aae5913c" }, - { - "ImportPath": "github.com/pborman/uuid", - "Rev": "v1.2.0" - }, { "ImportPath": "github.com/pelletier/go-toml", "Rev": "v1.2.0" @@ -850,10 +794,6 @@ "ImportPath": "github.com/subosito/gotenv", "Rev": "v1.2.0" }, - { - "ImportPath": "github.com/tidwall/pretty", - "Rev": "v1.0.0" - }, { "ImportPath": "github.com/tmc/grpc-websocket-proxy", "Rev": "0ad062ec5ee5" @@ -862,10 +802,6 @@ "ImportPath": "github.com/ugorji/go", "Rev": "v1.1.4" }, - { - "ImportPath": "github.com/vektah/gqlparser", - "Rev": "v1.1.2" - }, { "ImportPath": "github.com/xiang90/probing", "Rev": "43a291ad63a2" @@ -886,10 +822,6 @@ "ImportPath": "go.etcd.io/bbolt", "Rev": "v1.3.2" }, - { - "ImportPath": "go.mongodb.org/mongo-driver", - "Rev": "v1.1.2" - }, { "ImportPath": "go.opencensus.io", "Rev": "v0.22.3" @@ -1052,7 +984,7 @@ }, { "ImportPath": "k8s.io/cli-runtime", - "Rev": "cab8b2c14709" + "Rev": "5a5136b58165" }, { "ImportPath": "k8s.io/client-go", @@ -1104,19 +1036,19 @@ }, { "ImportPath": "sigs.k8s.io/kustomize/api", - "Rev": "v0.8.8" + "Rev": "v0.8.10" }, { "ImportPath": "sigs.k8s.io/kustomize/cmd/config", - "Rev": "v0.9.10" + "Rev": "v0.9.12" }, { "ImportPath": "sigs.k8s.io/kustomize/kustomize/v4", - "Rev": "v4.1.2" + "Rev": "v4.1.3" }, { "ImportPath": "sigs.k8s.io/kustomize/kyaml", - "Rev": "v0.10.17" + "Rev": "v0.10.20" }, { "ImportPath": "sigs.k8s.io/structured-merge-diff/v4", diff --git a/go.mod b/go.mod index 4093a16b0..5440f2aab 100644 --- a/go.mod +++ b/go.mod @@ -31,15 +31,15 @@ require ( github.com/stretchr/testify v1.7.0 golang.org/x/sys v0.0.0-20210426230700-d19ff857e887 gopkg.in/yaml.v2 v2.4.0 - k8s.io/api v0.0.0 - k8s.io/apimachinery v0.0.0 - k8s.io/cli-runtime v0.0.0 - k8s.io/client-go v0.0.0 - k8s.io/component-base v0.0.0 - k8s.io/component-helpers v0.0.0 + k8s.io/api v0.0.0-20210521070909-191e7be037d4 + k8s.io/apimachinery v0.0.0-20210521070659-adc48d2d7eb5 + k8s.io/cli-runtime v0.0.0-20210521115311-5a5136b58165 + k8s.io/client-go v0.0.0-20210521071212-d1fa200aef5b + k8s.io/component-base v0.0.0-20210521071829-2a2fe9bbf92f + k8s.io/component-helpers v0.0.0-20210521071950-5ed6d3a5a2d5 k8s.io/klog/v2 v2.8.0 k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e - k8s.io/metrics v0.0.0 + k8s.io/metrics v0.0.0-20210521073413-ec63c1eec669 k8s.io/utils v0.0.0-20201110183641-67b214c5f920 sigs.k8s.io/kustomize/api v0.8.10 sigs.k8s.io/kustomize/kustomize/v4 v4.1.3 @@ -47,13 +47,12 @@ require ( ) replace ( - k8s.io/api => ../api - k8s.io/apimachinery => ../apimachinery - k8s.io/cli-runtime => ../cli-runtime - k8s.io/client-go => ../client-go - k8s.io/code-generator => ../code-generator - k8s.io/component-base => ../component-base - k8s.io/component-helpers => ../component-helpers - k8s.io/kubectl => ../kubectl - k8s.io/metrics => ../metrics + k8s.io/api => k8s.io/api v0.0.0-20210521070909-191e7be037d4 + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210521070659-adc48d2d7eb5 + k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20210521115311-5a5136b58165 + k8s.io/client-go => k8s.io/client-go v0.0.0-20210521071212-d1fa200aef5b + k8s.io/code-generator => k8s.io/code-generator v0.0.0-20210521070450-0213807b44bf + k8s.io/component-base => k8s.io/component-base v0.0.0-20210521071829-2a2fe9bbf92f + k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20210521071950-5ed6d3a5a2d5 + k8s.io/metrics => k8s.io/metrics v0.0.0-20210521073413-ec63c1eec669 ) diff --git a/go.sum b/go.sum index beb60cc36..80b047893 100644 --- a/go.sum +++ b/go.sum @@ -669,6 +669,19 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= +k8s.io/api v0.0.0-20210521070909-191e7be037d4 h1:qgCkzN01a1u8h5bYNgyqdKqGL+K19wvkp1JLOv3Oj2E= +k8s.io/api v0.0.0-20210521070909-191e7be037d4/go.mod h1:GfPTpPBzvUagWJY1n2kt8oncShcczHwc4trHJ+04pNE= +k8s.io/apimachinery v0.0.0-20210521070659-adc48d2d7eb5 h1:h4JFYCyQWf4U+jFWHXMZYkL9Drx9hLiBQbftQBMAfwU= +k8s.io/apimachinery v0.0.0-20210521070659-adc48d2d7eb5/go.mod h1:8Ay3sPKuJtD/dIjPSlQVgJeuW/8JmLTCqDeAv6NSCxU= +k8s.io/cli-runtime v0.0.0-20210521115311-5a5136b58165 h1:B3PgG5/6tmoAUh4HewkSq2xRcCQI2Il+3KA08d95Cwc= +k8s.io/cli-runtime v0.0.0-20210521115311-5a5136b58165/go.mod h1:tqzSNRDj+3eMRmOZ7UzWmKClKQSho7TqHSJ4TSIIZhM= +k8s.io/client-go v0.0.0-20210521071212-d1fa200aef5b h1:mcl3yABrLVtYYWiFDkScO9n8op2wxzwEzReyjO4WEPY= +k8s.io/client-go v0.0.0-20210521071212-d1fa200aef5b/go.mod h1:fSZsfZrJMyBRs3783ddvdNtsZlZbJDL4O3F1ROhjdIY= +k8s.io/code-generator v0.0.0-20210521070450-0213807b44bf/go.mod h1:+I0Y7dLDIEgEJ8mo7J7cv/qF+opHxLfD1Ey7zbDmTIA= +k8s.io/component-base v0.0.0-20210521071829-2a2fe9bbf92f h1:5WGHsufGjyHFfwMXj0R/nilyN7HzOrb1XqGO6NErjDY= +k8s.io/component-base v0.0.0-20210521071829-2a2fe9bbf92f/go.mod h1:PLrHIJKBKJZB+zZsUAAQNbGrps/afIih9Oj/oqdQtsc= +k8s.io/component-helpers v0.0.0-20210521071950-5ed6d3a5a2d5 h1:LyASbOBRe6hZyOz0iUqy3vN2NAhoXGdyS3Sx0ceY0yk= +k8s.io/component-helpers v0.0.0-20210521071950-5ed6d3a5a2d5/go.mod h1:VtHw8VdyD4tglf1kptO/xCLXjw0LSJfvEg8cxVdpiKA= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= @@ -677,6 +690,8 @@ k8s.io/klog/v2 v2.8.0 h1:Q3gmuM9hKEjefWFFYF0Mat+YyFJvsUyYuwyNNJ5C9Ts= k8s.io/klog/v2 v2.8.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec= 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= +k8s.io/metrics v0.0.0-20210521073413-ec63c1eec669 h1:loDZnEiDKgNUSLRKvGEZAEtww0ZFPcGRLGikZH4aGzc= +k8s.io/metrics v0.0.0-20210521073413-ec63c1eec669/go.mod h1:SL7pVk0pMYgpH34rTPr7FobH0lYUahopvm3Hm4Ah1eM= k8s.io/utils v0.0.0-20201110183641-67b214c5f920 h1:CbnUZsM497iRC5QMVkHwyl8s2tB3g7yaSHkYPkpgelw= k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=