From 8fcebb31062e41a62da69d8b3734718c214976a6 Mon Sep 17 00:00:00 2001 From: Xiang Liu Date: Fri, 27 May 2022 01:31:41 +0800 Subject: [PATCH] fix(constant): use constant from resourcelock package --- .../proxy/network_services_controller.go | 16 ++++++++-------- pkg/controllers/routing/ecmp_vip.go | 3 ++- .../routing/network_routes_controller.go | 1 - 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkg/controllers/proxy/network_services_controller.go b/pkg/controllers/proxy/network_services_controller.go index d17f1473..628cbe6d 100644 --- a/pkg/controllers/proxy/network_services_controller.go +++ b/pkg/controllers/proxy/network_services_controller.go @@ -32,6 +32,7 @@ import ( api "k8s.io/api/core/v1" "k8s.io/client-go/kubernetes" "k8s.io/client-go/tools/cache" + "k8s.io/client-go/tools/leaderelection/resourcelock" "k8s.io/klog/v2" ) @@ -78,13 +79,12 @@ const ( svcSkipLbIpsAnnotation = "kube-router.io/service.skiplbips" svcSchedFlagsAnnotation = "kube-router.io/service.schedflags" - LeaderElectionRecordAnnotationKey = "control-plane.alpha.kubernetes.io/leader" - localIPsIPSetName = "kube-router-local-ips" - ipvsServicesIPSetName = "kube-router-ipvs-services" - serviceIPsIPSetName = "kube-router-service-ips" - ipvsFirewallChainName = "KUBE-ROUTER-SERVICES" - ipvsHairpinChainName = "KUBE-ROUTER-HAIRPIN" - synctypeAll = iota + localIPsIPSetName = "kube-router-local-ips" + ipvsServicesIPSetName = "kube-router-ipvs-services" + serviceIPsIPSetName = "kube-router-service-ips" + ipvsFirewallChainName = "KUBE-ROUTER-SERVICES" + ipvsHairpinChainName = "KUBE-ROUTER-HAIRPIN" + synctypeAll = iota synctypeIpvs tcpProtocol = "tcp" @@ -2035,7 +2035,7 @@ func (ln *linuxNetworking) setupRoutesForExternalIPForDSR(serviceInfoMap service } func isEndpointsForLeaderElection(ep *api.Endpoints) bool { - _, isLeaderElection := ep.Annotations[LeaderElectionRecordAnnotationKey] + _, isLeaderElection := ep.Annotations[resourcelock.LeaderElectionRecordAnnotationKey] return isLeaderElection } diff --git a/pkg/controllers/routing/ecmp_vip.go b/pkg/controllers/routing/ecmp_vip.go index a9026a05..d65d0bf3 100644 --- a/pkg/controllers/routing/ecmp_vip.go +++ b/pkg/controllers/routing/ecmp_vip.go @@ -16,6 +16,7 @@ import ( gobgpapi "github.com/osrg/gobgp/api" v1core "k8s.io/api/core/v1" "k8s.io/client-go/tools/cache" + "k8s.io/client-go/tools/leaderelection/resourcelock" "k8s.io/klog/v2" ) @@ -494,7 +495,7 @@ func (nrc *NetworkRoutingController) getAllVIPsForService(svc *v1core.Service) [ } func isEndpointsForLeaderElection(ep *v1core.Endpoints) bool { - _, isLeaderElection := ep.Annotations[LeaderElectionRecordAnnotationKey] + _, isLeaderElection := ep.Annotations[resourcelock.LeaderElectionRecordAnnotationKey] return isLeaderElection } diff --git a/pkg/controllers/routing/network_routes_controller.go b/pkg/controllers/routing/network_routes_controller.go index 38479fe6..fb3e51c4 100644 --- a/pkg/controllers/routing/network_routes_controller.go +++ b/pkg/controllers/routing/network_routes_controller.go @@ -60,7 +60,6 @@ const ( svcAdvertiseClusterAnnotation = "kube-router.io/service.advertise.clusterip" svcAdvertiseExternalAnnotation = "kube-router.io/service.advertise.externalip" svcAdvertiseLoadBalancerAnnotation = "kube-router.io/service.advertise.loadbalancerip" - LeaderElectionRecordAnnotationKey = "control-plane.alpha.kubernetes.io/leader" // Deprecated: use kube-router.io/service.advertise.loadbalancer instead svcSkipLbIpsAnnotation = "kube-router.io/service.skiplbips"