kubernetes
/
kube-controller-manager
mirror of https://github.com/kubernetes/kube-controller-manager.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 c0f5d13286
commit ddb0ed5049
3 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Godeps/Godeps.json generated
View File

@ -544,19 +544,19 @@
}, },
{ {
"ImportPath": "k8s.io/api", "ImportPath": "k8s.io/api",
"Rev": "a982eb560ae9" "Rev": "4934d0c67eba"
}, },
{ {
"ImportPath": "k8s.io/apimachinery", "ImportPath": "k8s.io/apimachinery",
"Rev": "da970ee67a06" "Rev": "2c6e837afb20"
}, },
{ {
"ImportPath": "k8s.io/client-go", "ImportPath": "k8s.io/client-go",
"Rev": "9bbcfbab83f6" "Rev": "e7a1d9ada0d5"
}, },
{ {
"ImportPath": "k8s.io/component-base", "ImportPath": "k8s.io/component-base",
"Rev": "840f05b81126" "Rev": "976a05f23b53"
}, },
{ {
"ImportPath": "k8s.io/gengo", "ImportPath": "k8s.io/gengo",
@ -568,7 +568,7 @@
}, },
{ {
"ImportPath": "k8s.io/kube-openapi", "ImportPath": "k8s.io/kube-openapi",
"Rev": "656914f816f9" "Rev": "6aeccd4b50c6"
}, },
{ {
"ImportPath": "k8s.io/utils", "ImportPath": "k8s.io/utils",
@ -579,8 +579,8 @@
"Rev": "v0.2.0" "Rev": "v0.2.0"
}, },
{ {
"ImportPath": "sigs.k8s.io/structured-merge-diff/v3", "ImportPath": "sigs.k8s.io/structured-merge-diff/v4",
"Rev": "43c19bbb7fba" "Rev": "v4.0.1"
}, },
{ {
"ImportPath": "sigs.k8s.io/yaml", "ImportPath": "sigs.k8s.io/yaml",

13
go.mod
View File

@ -5,14 +5,13 @@ module k8s.io/kube-controller-manager
go 1.15 go 1.15
require ( require (
k8s.io/apimachinery v0.0.0 k8s.io/apimachinery v0.0.0-20200813011404-2c6e837afb20
k8s.io/component-base v0.0.0 k8s.io/component-base v0.0.0-20200813012721-976a05f23b53
) )
replace ( replace (
k8s.io/api => ../api k8s.io/api => k8s.io/api v0.0.0-20200813011650-4934d0c67eba
k8s.io/apimachinery => ../apimachinery k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200813011404-2c6e837afb20
k8s.io/client-go => ../client-go k8s.io/client-go => k8s.io/client-go v0.0.0-20200813012017-e7a1d9ada0d5
k8s.io/component-base => ../component-base k8s.io/component-base => k8s.io/component-base v0.0.0-20200813012721-976a05f23b53
k8s.io/kube-controller-manager => ../kube-controller-manager
) )

4
go.sum
View File

@ -355,6 +355,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-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.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-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/component-base v0.0.0-20200813012721-976a05f23b53/go.mod h1:94CWKFudqgEEiA1H4waU0sHC0xhtMHQOHqAWC1Cz4a4=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= 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.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
k8s.io/klog/v2 v2.2.0 h1:XRvcwJozkgZ1UQJmfMGpvRthQHOvihEhYtDfAaxMz/A= k8s.io/klog/v2 v2.2.0 h1:XRvcwJozkgZ1UQJmfMGpvRthQHOvihEhYtDfAaxMz/A=