Merge pull request #98946 from monopole/upgradeKustomize

Upgrade kustomize-in-kubectl to v4.0.5

Kubernetes-commit: ff3ccc58cd926260731c5e6f4a9405d595916369
This commit is contained in:
Kubernetes Publisher 2021-03-08 20:47:20 -08:00
parent 6d8f4f9961
commit 7e8633789e
3 changed files with 33 additions and 23 deletions

28
Godeps/Godeps.json generated
View File

@ -192,7 +192,7 @@
},
{
"ImportPath": "github.com/creack/pty",
"Rev": "v1.1.7"
"Rev": "v1.1.9"
},
{
"ImportPath": "github.com/davecgh/go-spew",
@ -280,7 +280,7 @@
},
{
"ImportPath": "github.com/go-openapi/spec",
"Rev": "v0.19.3"
"Rev": "v0.19.5"
},
{
"ImportPath": "github.com/go-openapi/swag",
@ -504,7 +504,7 @@
},
{
"ImportPath": "github.com/kr/text",
"Rev": "v0.1.0"
"Rev": "v0.2.0"
},
{
"ImportPath": "github.com/magiconair/properties",
@ -586,6 +586,10 @@
"ImportPath": "github.com/mxk/go-flowrate",
"Rev": "cca7078d478f"
},
{
"ImportPath": "github.com/niemeyer/pretty",
"Rev": "a10e7caefd8e"
},
{
"ImportPath": "github.com/oklog/ulid",
"Rev": "v1.3.1"
@ -856,7 +860,7 @@
},
{
"ImportPath": "gopkg.in/check.v1",
"Rev": "41f04d3bba15"
"Rev": "8fa46927fb4f"
},
{
"ImportPath": "gopkg.in/cheggaaa/pb.v1",
@ -896,7 +900,7 @@
},
{
"ImportPath": "gopkg.in/yaml.v2",
"Rev": "v2.2.8"
"Rev": "v2.4.0"
},
{
"ImportPath": "gopkg.in/yaml.v3",
@ -916,31 +920,31 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "3687c906b8c9"
"Rev": "a61f0c601351"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "283a3268598b"
"Rev": "79c4f8795d25"
},
{
"ImportPath": "k8s.io/apiserver",
"Rev": "3672f53bd439"
"Rev": "13082be9278a"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "1745c9faaaff"
"Rev": "57d5462f1c4c"
},
{
"ImportPath": "k8s.io/cloud-provider",
"Rev": "e15b4fa2ef61"
"Rev": "db35e5b01fb7"
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "c5389948b7b3"
"Rev": "4fa38cbbb4bd"
},
{
"ImportPath": "k8s.io/controller-manager",
"Rev": "266e908b30a4"
"Rev": "3d6bb188a649"
},
{
"ImportPath": "k8s.io/gengo",

21
go.mod
View File

@ -5,18 +5,17 @@ module k8s.io/kube-controller-manager
go 1.16
require (
k8s.io/apimachinery v0.0.0
k8s.io/cloud-provider v0.0.0
k8s.io/controller-manager v0.0.0
k8s.io/apimachinery v0.0.0-20210309103648-79c4f8795d25
k8s.io/cloud-provider v0.0.0-20210309124245-db35e5b01fb7
k8s.io/controller-manager v0.0.0-20210309123843-3d6bb188a649
)
replace (
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/apiserver => ../apiserver
k8s.io/client-go => ../client-go
k8s.io/cloud-provider => ../cloud-provider
k8s.io/component-base => ../component-base
k8s.io/controller-manager => ../controller-manager
k8s.io/kube-controller-manager => ../kube-controller-manager
k8s.io/api => k8s.io/api v0.0.0-20210309104524-a61f0c601351
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210309103648-79c4f8795d25
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20210309112212-13082be9278a
k8s.io/client-go => k8s.io/client-go v0.0.0-20210309105448-57d5462f1c4c
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20210309124245-db35e5b01fb7
k8s.io/component-base => k8s.io/component-base v0.0.0-20210309111107-4fa38cbbb4bd
k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20210309123843-3d6bb188a649
)

7
go.sum
View File

@ -594,6 +594,13 @@ 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/apiserver v0.0.0-20210309112212-13082be9278a/go.mod h1:spTPK1/cbKIAWWTxiNX6bHjEbRmaU2/dLesLuSubf9w=
k8s.io/client-go v0.0.0-20210309105448-57d5462f1c4c/go.mod h1:mrNwZ+qFAB7jRkBD7KN8TgbjuxbbzeWRIqfSMxAFW2c=
k8s.io/cloud-provider v0.0.0-20210309124245-db35e5b01fb7/go.mod h1:wulL6qq0ZdWhnyiYZvggdrZyV6yzNcsoH6YoJyya/zE=
k8s.io/component-base v0.0.0-20210309111107-4fa38cbbb4bd/go.mod h1:pbboqWCaO57UORCfdUk+Bitf/rB3V8mhYkrWdR0LsCU=
k8s.io/controller-manager v0.0.0-20210309123843-3d6bb188a649/go.mod h1:svO7RICr/T5aqRNbVSq0S2K4Qe2vMvAZ0tvA/R0hNN0=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
k8s.io/klog/v2 v2.5.0 h1:8mOnjf1RmUPW6KRqQCfYSZq/K20Unmp3IhuZUhxl8KI=