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 #103483 from odinuge/revert-102508-runc-1.0 

Revert "Update runc to 1.0.0"

Kubernetes-commit: eae87bfe7e9636694a5cb45a9863715b7b25435c
This commit is contained in:
Kubernetes Publisher 2021-07-06 10:42:56 -07:00
parent aedad43a7f
commit 7f8568f687
2 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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-20210701054147-830375057167
k8s.io/cloud-provider v0.0.0-20210706221108-8335356999f0
k8s.io/controller-manager v0.0.0-20210706221002-fcad9e8b440f
)
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-20210705094346-9f69feafab6a
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210701054147-830375057167
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20210706215528-462585d9747b
k8s.io/client-go => k8s.io/client-go v0.0.0-20210706214629-68cb2ddef93f
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20210706221108-8335356999f0
k8s.io/component-base => k8s.io/component-base v0.0.0-20210702054709-fddd92849e34
k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20210706221002-fcad9e8b440f
)

12
go.sum
View File

@ -680,6 +680,18 @@ 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-20210705094346-9f69feafab6a h1:IF+SZibisSFDDUi+Gll4HgpnMjzP2lp6YlymxNtbtdw=
k8s.io/api v0.0.0-20210705094346-9f69feafab6a/go.mod h1:zoURDvOPW5UMFZr2YUU/sStjYnWSPt+x+MM4R94ATgQ=
k8s.io/apimachinery v0.0.0-20210701054147-830375057167 h1:fob/j8+uMBIVvyo+9bG7GvjFSj0LX3RNuSXW+RcUrwo=
k8s.io/apimachinery v0.0.0-20210701054147-830375057167/go.mod h1:O3oNtNadZdeOMxHFVxOreoznohCpy0z6mocxbZr7oJ0=
k8s.io/apiserver v0.0.0-20210706215528-462585d9747b/go.mod h1:S2s15aEgrKA3AN7HHp780iwUScuUQhrUOn+97ASdm1k=
k8s.io/client-go v0.0.0-20210706214629-68cb2ddef93f/go.mod h1:sbkKCOXetW3FaqcSYCG3ghdfOCSOKTGwitXlliklRrc=
k8s.io/cloud-provider v0.0.0-20210706221108-8335356999f0 h1:5eJetFuHHScAdeg10YkEWHZe8cwBjMcIvgen0F33+7I=
k8s.io/cloud-provider v0.0.0-20210706221108-8335356999f0/go.mod h1:wJ0p7kgdm4cvkTeLyC6LjuXMwNtPiPg9mhvjTHSpR/Q=
k8s.io/component-base v0.0.0-20210702054709-fddd92849e34 h1:L7kJX0+rX5SJ2ZUaFy8zarcUMW0+2AHkd3gyuIp0ZLM=
k8s.io/component-base v0.0.0-20210702054709-fddd92849e34/go.mod h1:KuldLgSPMxWtcVmPn3hcUoWNJqm7HEdVcSID+ZdAB24=
k8s.io/controller-manager v0.0.0-20210706221002-fcad9e8b440f h1:wrnzB0YbKMJkTdrBxy3hxR479xAzxN6Qe22RAXrps1E=
k8s.io/controller-manager v0.0.0-20210706221002-fcad9e8b440f/go.mod h1:eyAoa40yH8A5XQX82NFZfcXEAQ0L5s1mP5QMJWuYYsk=
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.9.0 h1:D7HV+n1V57XeZ0m6tdRkfknthUaM06VFbWldOFh8kzM=