diff --git a/cmd/gke-gcloud-auth-plugin/cred_test.go b/cmd/gke-gcloud-auth-plugin/cred_test.go index f09409f4d8..b88ba6ec94 100644 --- a/cmd/gke-gcloud-auth-plugin/cred_test.go +++ b/cmd/gke-gcloud-auth-plugin/cred_test.go @@ -40,7 +40,6 @@ var ( "extra_args": "%s" } ` - invalidCacheFile = "invalid_cache_file" fakeCurrentContext = "gke_user-gke-dev_us-east1-b_cluster-1" cachedAccessToken = "ya29.cached_token" diff --git a/pkg/controller/nodeipam/ipam/cloud_cidr_allocator.go b/pkg/controller/nodeipam/ipam/cloud_cidr_allocator.go index c508446363..7edc4ae73e 100644 --- a/pkg/controller/nodeipam/ipam/cloud_cidr_allocator.go +++ b/pkg/controller/nodeipam/ipam/cloud_cidr_allocator.go @@ -327,11 +327,11 @@ func (ca *cloudCIDRAllocator) AllocateOrOccupyCIDR(node *v1.Node) error { } func (ca *cloudCIDRAllocator) runWorker(ctx context.Context) { - for ca.processNextItem(ctx) { + for ca.processNextItem() { } } -func (ca *cloudCIDRAllocator) processNextItem(ctx context.Context) bool { +func (ca *cloudCIDRAllocator) processNextItem() bool { key, quit := ca.queue.Get() if quit { return false diff --git a/pkg/controller/service/controller.go b/pkg/controller/service/controller.go index 6a5f55889e..23ad9fa585 100644 --- a/pkg/controller/service/controller.go +++ b/pkg/controller/service/controller.go @@ -331,7 +331,7 @@ func (c *Controller) processServiceCreateOrUpdate(ctx context.Context, service * // This happens only when a service is deleted and re-created // in a short period, which is only possible when it doesn't // contain finalizer. - if err := c.processLoadBalancerDelete(ctx, cachedService.state, key); err != nil { + if err := c.processLoadBalancerDelete(ctx, cachedService.state); err != nil { return err } } @@ -524,12 +524,6 @@ func (s *serviceCache) getOrCreate(serviceName string) *cachedService { return service } -func (s *serviceCache) set(serviceName string, service *cachedService) { - s.mu.Lock() - defer s.mu.Unlock() - s.serviceMap[serviceName] = service -} - func (s *serviceCache) delete(serviceName string) { s.mu.Lock() defer s.mu.Unlock() @@ -921,14 +915,14 @@ func (c *Controller) processServiceDeletion(ctx context.Context, key string) err return nil } klog.V(2).Infof("Service %v has been deleted. Attempting to cleanup load balancer resources", key) - if err := c.processLoadBalancerDelete(ctx, cachedService.state, key); err != nil { + if err := c.processLoadBalancerDelete(ctx, cachedService.state); err != nil { return err } c.cache.delete(key) return nil } -func (c *Controller) processLoadBalancerDelete(ctx context.Context, service *v1.Service, key string) error { +func (c *Controller) processLoadBalancerDelete(ctx context.Context, service *v1.Service) error { // delete load balancer info only if the service type is LoadBalancer if !WantsLoadBalancer(service) { return nil @@ -1003,12 +997,6 @@ func (c *Controller) patchStatus(service *v1.Service, previousStatus, newStatus type NodeConditionPredicate func(node *v1.Node) bool var ( - allNodePredicates []NodeConditionPredicate = []NodeConditionPredicate{ - nodeIncludedPredicate, - nodeUnTaintedPredicate, - nodeReadyPredicate, - } - stableNodeSetPredicates []NodeConditionPredicate = []NodeConditionPredicate{ nodeNotDeletedPredicate, nodeIncludedPredicate, @@ -1044,16 +1032,6 @@ func nodeUnTaintedPredicate(node *v1.Node) bool { return true } -// We consider the node for load balancing only when its NodeReady condition status is ConditionTrue -func nodeReadyPredicate(node *v1.Node) bool { - for _, cond := range node.Status.Conditions { - if cond.Type == v1.NodeReady { - return cond.Status == v1.ConditionTrue - } - } - return false -} - func nodeNotDeletedPredicate(node *v1.Node) bool { return node.DeletionTimestamp.IsZero() }