From 109fa652639f84ee2b3e50982f570b1a91d10fb9 Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Mon, 8 Mar 2021 20:47:20 -0800 Subject: [PATCH] Merge pull request #98946 from monopole/upgradeKustomize Upgrade kustomize-in-kubectl to v4.0.5 Kubernetes-commit: ff3ccc58cd926260731c5e6f4a9405d595916369 --- Godeps/Godeps.json | 24 ++++++++++++++++-------- go.mod | 17 ++++++++--------- go.sum | 4 ++++ 3 files changed, 28 insertions(+), 17 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 710eaac0..cfcacff8 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -102,6 +102,10 @@ "ImportPath": "github.com/client9/misspell", "Rev": "v0.3.4" }, + { + "ImportPath": "github.com/creack/pty", + "Rev": "v1.1.9" + }, { "ImportPath": "github.com/davecgh/go-spew", "Rev": "v1.1.1" @@ -160,7 +164,7 @@ }, { "ImportPath": "github.com/go-openapi/spec", - "Rev": "v0.19.3" + "Rev": "v0.19.5" }, { "ImportPath": "github.com/go-openapi/swag", @@ -272,7 +276,7 @@ }, { "ImportPath": "github.com/kr/text", - "Rev": "v0.1.0" + "Rev": "v0.2.0" }, { "ImportPath": "github.com/mailru/easyjson", @@ -302,6 +306,10 @@ "ImportPath": "github.com/mxk/go-flowrate", "Rev": "cca7078d478f" }, + { + "ImportPath": "github.com/niemeyer/pretty", + "Rev": "a10e7caefd8e" + }, { "ImportPath": "github.com/onsi/ginkgo", "Rev": "v1.11.0" @@ -436,7 +444,7 @@ }, { "ImportPath": "gopkg.in/check.v1", - "Rev": "41f04d3bba15" + "Rev": "8fa46927fb4f" }, { "ImportPath": "gopkg.in/errgo.v2", @@ -456,7 +464,7 @@ }, { "ImportPath": "gopkg.in/yaml.v2", - "Rev": "v2.2.8" + "Rev": "v2.4.0" }, { "ImportPath": "gopkg.in/yaml.v3", @@ -468,19 +476,19 @@ }, { "ImportPath": "k8s.io/api", - "Rev": "3687c906b8c9" + "Rev": "a61f0c601351" }, { "ImportPath": "k8s.io/apimachinery", - "Rev": "283a3268598b" + "Rev": "79c4f8795d25" }, { "ImportPath": "k8s.io/client-go", - "Rev": "1745c9faaaff" + "Rev": "57d5462f1c4c" }, { "ImportPath": "k8s.io/code-generator", - "Rev": "cc2553e427ca" + "Rev": "24be182ad6d3" }, { "ImportPath": "k8s.io/gengo", diff --git a/go.mod b/go.mod index 3388ee45..6ed74d63 100644 --- a/go.mod +++ b/go.mod @@ -5,17 +5,16 @@ module k8s.io/sample-controller go 1.16 require ( - k8s.io/api v0.0.0 - k8s.io/apimachinery v0.0.0 - k8s.io/client-go v0.0.0 - k8s.io/code-generator v0.0.0 + k8s.io/api v0.0.0-20210309104524-a61f0c601351 + k8s.io/apimachinery v0.0.0-20210309103648-79c4f8795d25 + k8s.io/client-go v0.0.0-20210309105448-57d5462f1c4c + k8s.io/code-generator v0.0.0-20210309103010-24be182ad6d3 k8s.io/klog/v2 v2.5.0 ) replace ( - k8s.io/api => ../api - k8s.io/apimachinery => ../apimachinery - k8s.io/client-go => ../client-go - k8s.io/code-generator => ../code-generator - k8s.io/sample-controller => ../sample-controller + k8s.io/api => k8s.io/api v0.0.0-20210309104524-a61f0c601351 + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210309103648-79c4f8795d25 + k8s.io/client-go => k8s.io/client-go v0.0.0-20210309105448-57d5462f1c4c + k8s.io/code-generator => k8s.io/code-generator v0.0.0-20210309103010-24be182ad6d3 ) diff --git a/go.sum b/go.sum index c61cb378..728a59ef 100644 --- a/go.sum +++ b/go.sum @@ -435,6 +435,10 @@ 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-20210309104524-a61f0c601351/go.mod h1:JvvTgB3AvDyONXbbMsVhQMb75g5NbLgOEgdedrBqLVw= +k8s.io/apimachinery v0.0.0-20210309103648-79c4f8795d25/go.mod h1:ZaN7d/yx5I8h2mk8Nu08sdLigsmkt4flkTxCTc9LElI= +k8s.io/client-go v0.0.0-20210309105448-57d5462f1c4c/go.mod h1:mrNwZ+qFAB7jRkBD7KN8TgbjuxbbzeWRIqfSMxAFW2c= +k8s.io/code-generator v0.0.0-20210309103010-24be182ad6d3/go.mod h1:IpCUojpiKp25KNB3/UbEeElznqpQUMvhAOUoC7AbISY= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027 h1:Uusb3oh8XcdzDF/ndlI4ToKTYVlkCSJP39SRY2mfRAw= k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=