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 #99014 from apelisse/update-smd 

Update sigs.k8s.io/structured-merge-diff to v4.0.3

Kubernetes-commit: 93252fa433214462e61495a63e792b756fd6777a
This commit is contained in:
Kubernetes Publisher 2021-02-16 16:39:18 -08:00
parent 303c7f26e4
commit 375f153ece
3 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Godeps/Godeps.json generated
View File

@ -912,31 +912,31 @@
}, },
{ {
"ImportPath": "k8s.io/api", "ImportPath": "k8s.io/api",
"Rev": "48bd8381a38a" "Rev": "bed38c9b8815"
}, },
{ {
"ImportPath": "k8s.io/apimachinery", "ImportPath": "k8s.io/apimachinery",
"Rev": "c93b0f84892e" "Rev": "527a61b4dffe"
}, },
{ {
"ImportPath": "k8s.io/apiserver", "ImportPath": "k8s.io/apiserver",
"Rev": "abc2bd5cb28d" "Rev": "48035f86fefb"
}, },
{ {
"ImportPath": "k8s.io/client-go", "ImportPath": "k8s.io/client-go",
"Rev": "100613764a76" "Rev": "df50762b9f56"
}, },
{ {
"ImportPath": "k8s.io/cloud-provider", "ImportPath": "k8s.io/cloud-provider",
"Rev": "aab14f8718d3" "Rev": "fa6a10f95c3e"
}, },
{ {
"ImportPath": "k8s.io/component-base", "ImportPath": "k8s.io/component-base",
"Rev": "fc5f0989f107" "Rev": "bf61fcdb2cb3"
}, },
{ {
"ImportPath": "k8s.io/controller-manager", "ImportPath": "k8s.io/controller-manager",
"Rev": "5fbf917d3bb5" "Rev": "47d19a6fc305"
}, },
{ {
"ImportPath": "k8s.io/gengo", "ImportPath": "k8s.io/gengo",
@ -972,7 +972,7 @@
}, },
{ {
"ImportPath": "sigs.k8s.io/structured-merge-diff/v4", "ImportPath": "sigs.k8s.io/structured-merge-diff/v4",
"Rev": "v4.0.2" "Rev": "v4.0.3"
}, },
{ {
"ImportPath": "sigs.k8s.io/yaml", "ImportPath": "sigs.k8s.io/yaml",

21
go.mod
View File

@ -5,18 +5,17 @@ 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-20210217011835-527a61b4dffe
k8s.io/cloud-provider v0.0.0 k8s.io/cloud-provider v0.0.0-20210217014926-fa6a10f95c3e
k8s.io/controller-manager v0.0.0 k8s.io/controller-manager v0.0.0-20210217014822-47d19a6fc305
) )
replace ( replace (
k8s.io/api => ../api k8s.io/api => k8s.io/api v0.0.0-20210217012028-bed38c9b8815
k8s.io/apimachinery => ../apimachinery k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210217011835-527a61b4dffe
k8s.io/apiserver => ../apiserver k8s.io/apiserver => k8s.io/apiserver v0.0.0-20210217013154-48035f86fefb
k8s.io/client-go => ../client-go k8s.io/client-go => k8s.io/client-go v0.0.0-20210217012314-df50762b9f56
k8s.io/cloud-provider => ../cloud-provider k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20210217014926-fa6a10f95c3e
k8s.io/component-base => ../component-base k8s.io/component-base => k8s.io/component-base v0.0.0-20210217012751-bf61fcdb2cb3
k8s.io/controller-manager => ../controller-manager k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20210217014822-47d19a6fc305
k8s.io/kube-controller-manager => ../kube-controller-manager
) )

7
go.sum
View File

@ -585,6 +585,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.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=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.0.0-20210217012028-bed38c9b8815/go.mod h1:60tmSUpHxGPFerNHbo/ayI2lKxvtrhbxFyXuEIWJd78=
k8s.io/apimachinery v0.0.0-20210217011835-527a61b4dffe/go.mod h1:Z7ps/g0rjlTeMstYrMOUttJfT2Gg34DEaG/f2PYLCWY=
k8s.io/apiserver v0.0.0-20210217013154-48035f86fefb/go.mod h1:85mDZ8FeWVtaGXSADDvs1+v0E2kpHNuOr6C+Tu6DQ1o=
k8s.io/client-go v0.0.0-20210217012314-df50762b9f56/go.mod h1:HZqZ8L/2jv2Wi5paCJ2WsQsjG4snn1a9L7hDHac/GNM=
k8s.io/cloud-provider v0.0.0-20210217014926-fa6a10f95c3e/go.mod h1:GqNZrsUqqyVuGS4vhxBw+P10xMjkAM234rpiIG8sKTU=
k8s.io/component-base v0.0.0-20210217012751-bf61fcdb2cb3/go.mod h1:gazbxECw90jDRTaMRWKvkWJtQMg8JkZmQTWfUAvL5gQ=
k8s.io/controller-manager v0.0.0-20210217014822-47d19a6fc305/go.mod h1:RMibWLvYXjMHtpT4UFLESxjtTzyfGFbRkGrzGQd/mFM=
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.5.0 h1:8mOnjf1RmUPW6KRqQCfYSZq/K20Unmp3IhuZUhxl8KI= k8s.io/klog/v2 v2.5.0 h1:8mOnjf1RmUPW6KRqQCfYSZq/K20Unmp3IhuZUhxl8KI=