Merge pull request #93867 from apelisse/update-smd

Update SMD to v4.0.1 and kube-openapi

Kubernetes-commit: f4e9c3fd2745695308edd1fd725911fa564efe83
This commit is contained in:
Kubernetes Publisher 2020-08-12 17:00:15 -07:00
parent 8877c11a87
commit 1a8fae04de
3 changed files with 19 additions and 16 deletions

14
Godeps/Godeps.json generated
View File

@ -448,19 +448,19 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "a982eb560ae9"
"Rev": "4934d0c67eba"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "da970ee67a06"
"Rev": "2c6e837afb20"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "9bbcfbab83f6"
"Rev": "e7a1d9ada0d5"
},
{
"ImportPath": "k8s.io/code-generator",
"Rev": "26c52896b75b"
"Rev": "5a311e69ffcf"
},
{
"ImportPath": "k8s.io/gengo",
@ -472,7 +472,7 @@
},
{
"ImportPath": "k8s.io/kube-openapi",
"Rev": "656914f816f9"
"Rev": "6aeccd4b50c6"
},
{
"ImportPath": "k8s.io/utils",
@ -483,8 +483,8 @@
"Rev": "v0.2.0"
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/v3",
"Rev": "43c19bbb7fba"
"ImportPath": "sigs.k8s.io/structured-merge-diff/v4",
"Rev": "v4.0.1"
},
{
"ImportPath": "sigs.k8s.io/yaml",

17
go.mod
View File

@ -5,17 +5,16 @@ module k8s.io/sample-controller
go 1.15
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-20200813011650-4934d0c67eba
k8s.io/apimachinery v0.0.0-20200813011404-2c6e837afb20
k8s.io/client-go v0.0.0-20200813012017-e7a1d9ada0d5
k8s.io/code-generator v0.0.0-20200813011144-5a311e69ffcf
k8s.io/klog/v2 v2.2.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-20200813011650-4934d0c67eba
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200813011404-2c6e837afb20
k8s.io/client-go => k8s.io/client-go v0.0.0-20200813012017-e7a1d9ada0d5
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200813011144-5a311e69ffcf
)

4
go.sum
View File

@ -354,6 +354,10 @@ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
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=
k8s.io/api v0.0.0-20200813011650-4934d0c67eba/go.mod h1:QJ0oQNNZl/Xp5kUlzey804E6C+Vj1FnxAx5MuW0GkTI=
k8s.io/apimachinery v0.0.0-20200813011404-2c6e837afb20/go.mod h1:1z+ESypfBDWAQXahXbqiOO581DaYTRgdaHAi60KXR1s=
k8s.io/client-go v0.0.0-20200813012017-e7a1d9ada0d5/go.mod h1:dIFJBSkp6Fh6Mv1+bRxSN7O/Ze489PT2VztfLmqUfXM=
k8s.io/code-generator v0.0.0-20200813011144-5a311e69ffcf/go.mod h1:moqLn7w0t9cMs4+5CQyxnfA/HV8MF6aAVENF+WZZhgk=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14 h1:t4L10Qfx/p7ASH3gXCdIUtPbbIuegCoUJf3TMSFekjw=
k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=