Merge pull request #102883 from liggitt/etcd-embed

Simplify embedded etcd server

Kubernetes-commit: 902e507824068fe1f6cb7044a6b599dc3c285b7a
This commit is contained in:
Kubernetes Publisher 2021-06-24 04:27:40 -07:00
parent b592a0a8d2
commit 4f68ff36e0
2 changed files with 22 additions and 11 deletions

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-20210619071501-4713ab59dd88
k8s.io/cloud-provider v0.0.0-20210624120620-fd9650ed99bf
k8s.io/controller-manager v0.0.0-20210624120513-64d6d70d2a6a
)
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-20210623031714-d4897f24d38d
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210619071501-4713ab59dd88
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20210624115013-a72925236ce1
k8s.io/client-go => k8s.io/client-go v0.0.0-20210619071903-3fae6f05ac95
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20210624120620-fd9650ed99bf
k8s.io/component-base => k8s.io/component-base v0.0.0-20210622112647-573397b706f6
k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20210624120513-64d6d70d2a6a
)

12
go.sum
View File

@ -676,6 +676,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-20210623031714-d4897f24d38d h1:EIaYOHYm13zWj3myUuVZH9fqSUnAmB7GKoiUoufoZj0=
k8s.io/api v0.0.0-20210623031714-d4897f24d38d/go.mod h1:dPr4vYpBMxtH6RV3Sx1BkuNqvS8PvNu1U1QShIc9EUg=
k8s.io/apimachinery v0.0.0-20210619071501-4713ab59dd88 h1:9Qc+08Nttbg1dtl8dElWJv9nGb0aMA+Qbx4sXD9iK2E=
k8s.io/apimachinery v0.0.0-20210619071501-4713ab59dd88/go.mod h1:AZCsxGyiXb/4yTvUIiY+4LESjQ12B77LFrbW2xd61is=
k8s.io/apiserver v0.0.0-20210624115013-a72925236ce1/go.mod h1:s8kzj4ygQuUndDqgspzIpTs8auWTt5oyquZ+TZVQxns=
k8s.io/client-go v0.0.0-20210619071903-3fae6f05ac95/go.mod h1:KdxPzTHgLRCmXpcnSOA+LaZEp8WyV8TQMVbFMTeJWIA=
k8s.io/cloud-provider v0.0.0-20210624120620-fd9650ed99bf h1:IfvAei/5dOw0a3VULzrI0Dp6oIcU2Ot6ozv3BgvqHds=
k8s.io/cloud-provider v0.0.0-20210624120620-fd9650ed99bf/go.mod h1:f7JdNRytr1Or+I6fq7YL7OdJ8pyMcmfADkmaHMbU6RU=
k8s.io/component-base v0.0.0-20210622112647-573397b706f6 h1:fqgjYHQo/UQtfRXsTIv6ZOCPEcdSAooyUOU8OZAmZmY=
k8s.io/component-base v0.0.0-20210622112647-573397b706f6/go.mod h1:RwSvrG7yEBwMDhwYXuMGl6zz/ufmJuveaOC/GspqdRE=
k8s.io/controller-manager v0.0.0-20210624120513-64d6d70d2a6a h1:Ctub3bO1NgYQJx503dGaWjaLlNMaWS+RHpU/dIKr2q8=
k8s.io/controller-manager v0.0.0-20210624120513-64d6d70d2a6a/go.mod h1:Mjz8KGdEtZKqEDd3ZFAno0ZG1r+iD4yAPjVBqZUfXD4=
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=