mirrors/kube-router
1
0
Fork 0
mirror of https://github.com/cloudnativelabs/kube-router.git synced 2025-11-19 12:01:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(constant): use constant from resourcelock package

Browse Source
This commit is contained in:
Xiang Liu 2022-05-27 01:31:41 +08:00 committed by Aaron U'Ren
parent 761f6a3240
commit 8fcebb3106
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/controllers/proxy/network_services_controller.go
View File

@ -32,6 +32,7 @@ import (
api "k8s.io/api/core/v1" api "k8s.io/api/core/v1"
"k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes"
"k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/cache"
"k8s.io/client-go/tools/leaderelection/resourcelock"
"k8s.io/klog/v2" "k8s.io/klog/v2"
) )
@ -78,13 +79,12 @@ const (
svcSkipLbIpsAnnotation = "kube-router.io/service.skiplbips" svcSkipLbIpsAnnotation = "kube-router.io/service.skiplbips"
svcSchedFlagsAnnotation = "kube-router.io/service.schedflags" svcSchedFlagsAnnotation = "kube-router.io/service.schedflags"
LeaderElectionRecordAnnotationKey = "control-plane.alpha.kubernetes.io/leader" localIPsIPSetName = "kube-router-local-ips"
localIPsIPSetName = "kube-router-local-ips" ipvsServicesIPSetName = "kube-router-ipvs-services"
ipvsServicesIPSetName = "kube-router-ipvs-services" serviceIPsIPSetName = "kube-router-service-ips"
serviceIPsIPSetName = "kube-router-service-ips" ipvsFirewallChainName = "KUBE-ROUTER-SERVICES"
ipvsFirewallChainName = "KUBE-ROUTER-SERVICES" ipvsHairpinChainName = "KUBE-ROUTER-HAIRPIN"
ipvsHairpinChainName = "KUBE-ROUTER-HAIRPIN" synctypeAll = iota
synctypeAll = iota
synctypeIpvs synctypeIpvs
tcpProtocol = "tcp" tcpProtocol = "tcp"
@ -2035,7 +2035,7 @@ func (ln *linuxNetworking) setupRoutesForExternalIPForDSR(serviceInfoMap service
} }
func isEndpointsForLeaderElection(ep *api.Endpoints) bool { func isEndpointsForLeaderElection(ep *api.Endpoints) bool {
_, isLeaderElection := ep.Annotations[LeaderElectionRecordAnnotationKey] _, isLeaderElection := ep.Annotations[resourcelock.LeaderElectionRecordAnnotationKey]
return isLeaderElection return isLeaderElection
} }

3
pkg/controllers/routing/ecmp_vip.go
View File

@ -16,6 +16,7 @@ import (
gobgpapi "github.com/osrg/gobgp/api" gobgpapi "github.com/osrg/gobgp/api"
v1core "k8s.io/api/core/v1" v1core "k8s.io/api/core/v1"
"k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/cache"
"k8s.io/client-go/tools/leaderelection/resourcelock"
"k8s.io/klog/v2" "k8s.io/klog/v2"
) )
@ -494,7 +495,7 @@ func (nrc *NetworkRoutingController) getAllVIPsForService(svc *v1core.Service) [
} }
func isEndpointsForLeaderElection(ep *v1core.Endpoints) bool { func isEndpointsForLeaderElection(ep *v1core.Endpoints) bool {
_, isLeaderElection := ep.Annotations[LeaderElectionRecordAnnotationKey] _, isLeaderElection := ep.Annotations[resourcelock.LeaderElectionRecordAnnotationKey]
return isLeaderElection return isLeaderElection
} }

1
pkg/controllers/routing/network_routes_controller.go
View File

@ -60,7 +60,6 @@ const (
svcAdvertiseClusterAnnotation = "kube-router.io/service.advertise.clusterip" svcAdvertiseClusterAnnotation = "kube-router.io/service.advertise.clusterip"
svcAdvertiseExternalAnnotation = "kube-router.io/service.advertise.externalip" svcAdvertiseExternalAnnotation = "kube-router.io/service.advertise.externalip"
svcAdvertiseLoadBalancerAnnotation = "kube-router.io/service.advertise.loadbalancerip" svcAdvertiseLoadBalancerAnnotation = "kube-router.io/service.advertise.loadbalancerip"
LeaderElectionRecordAnnotationKey = "control-plane.alpha.kubernetes.io/leader"
// Deprecated: use kube-router.io/service.advertise.loadbalancer instead // Deprecated: use kube-router.io/service.advertise.loadbalancer instead
svcSkipLbIpsAnnotation = "kube-router.io/service.skiplbips" svcSkipLbIpsAnnotation = "kube-router.io/service.skiplbips"