Merge pull request #103548 from dims/drop-hashicorp-lru

Drop hashicorp lru - switch to the lru impl in k8s.io/utils

Kubernetes-commit: 9c4905e7af0d070d139c06638ab9868fd3521883
This commit is contained in:
Kubernetes Publisher 2021-07-08 00:12:53 -07:00
parent ee8b11c029
commit 5ef16c64ea
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-20210708014216-0dafcb48b31e
k8s.io/cloud-provider v0.0.0-20210708101054-de3ee03c52af
k8s.io/controller-manager v0.0.0-20210708100944-b984373c7696
)
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-20210708014407-1e1dad4bd9d1
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210708014216-0dafcb48b31e
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20210708095427-bfdf7b274827
k8s.io/client-go => k8s.io/client-go v0.0.0-20210708094636-69e00b04ba4c
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20210708101054-de3ee03c52af
k8s.io/component-base => k8s.io/component-base v0.0.0-20210708095030-632996df852a
k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20210708100944-b984373c7696
)

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-20210708014407-1e1dad4bd9d1 h1:BsVbhrF9ZXWlpo/84y3WdGGw+SYu61RlNKOMqGKDIQE=
k8s.io/api v0.0.0-20210708014407-1e1dad4bd9d1/go.mod h1:UGtjmHCgj1IMXqa0rRAXNNszZBo1IKpAhbvSre33vSU=
k8s.io/apimachinery v0.0.0-20210708014216-0dafcb48b31e h1:EZ+ZrcPtnkR8vVo7bBSwoMD9a0HaC29O6lJhcZgwsJQ=
k8s.io/apimachinery v0.0.0-20210708014216-0dafcb48b31e/go.mod h1:O3oNtNadZdeOMxHFVxOreoznohCpy0z6mocxbZr7oJ0=
k8s.io/apiserver v0.0.0-20210708095427-bfdf7b274827/go.mod h1:/0IErrtw/wKVicRWnA9HEDNjP6fFyQJjnTbGCTjGhug=
k8s.io/client-go v0.0.0-20210708094636-69e00b04ba4c/go.mod h1:gdC8LfT2kw5hm9VcRUqlVkMMkbfYIxDWvPITF7hl7K8=
k8s.io/cloud-provider v0.0.0-20210708101054-de3ee03c52af h1:D/gI0816QJckihZi2DxH5WhSdzOb7AEBMMDyYjXvodo=
k8s.io/cloud-provider v0.0.0-20210708101054-de3ee03c52af/go.mod h1:lrvehQoNBAqvxWapIosd5bLihuBD9EjRlSd6Gn7EtUY=
k8s.io/component-base v0.0.0-20210708095030-632996df852a h1:PRk5Hh5WlaBfH5IjtoqNeL1Waqillce5m2p7RuvOeqA=
k8s.io/component-base v0.0.0-20210708095030-632996df852a/go.mod h1:LBVnEifw+SvQx2si1RCpd0WVE198EULnwqnMg0QBBQQ=
k8s.io/controller-manager v0.0.0-20210708100944-b984373c7696 h1:P8ahxq5YsRkocTBoEE85FT+2tJ2MzNiSwDJhueV2GI8=
k8s.io/controller-manager v0.0.0-20210708100944-b984373c7696/go.mod h1:JG06GTf65nGCl/vno2KjM+shZGN+bh0D5WsfoiASrEo=
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=