Fix target changes on LB

go.mod

@@ -34,9 +34,9 @@ require (
  gorm.io/gorm v1.23.8
  k8s.io/api v0.25.0
  k8s.io/apiextensions-apiserver v0.24.2
- k8s.io/apimachinery v0.25.0
+ k8s.io/apimachinery v0.26.1
  k8s.io/client-go v0.25.0
- k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed
+ k8s.io/utils v0.0.0-20221107191617-1a15be271d1d
  sigs.k8s.io/controller-runtime v0.12.3
 )
 
@@ -138,8 +138,8 @@ require (
  gopkg.in/yaml.v3 v3.0.1 // indirect
  honnef.co/go/tools v0.2.2 // indirect
  k8s.io/component-base v0.24.2 // indirect
- k8s.io/klog/v2 v2.70.1 // indirect
- k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
+ k8s.io/klog/v2 v2.80.1 // indirect
+ k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
  sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
  sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
  sigs.k8s.io/yaml v1.3.0 // indirect

go.sum

@@ -1040,8 +1040,8 @@ k8s.io/api v0.25.0/go.mod h1:ttceV1GyV1i1rnmvzT3BST08N6nGt+dudGrquzVQWPk=
 k8s.io/apiextensions-apiserver v0.24.2 h1:/4NEQHKlEz1MlaK/wHT5KMKC9UKYz6NZz6JE6ov4G6k=
 k8s.io/apiextensions-apiserver v0.24.2/go.mod h1:e5t2GMFVngUEHUd0wuCJzw8YDwZoqZfJiGOW6mm2hLQ=
 k8s.io/apimachinery v0.24.2/go.mod h1:82Bi4sCzVBdpYjyI4jY6aHX+YCUchUIrZrXKedjd2UM=
-k8s.io/apimachinery v0.25.0 h1:MlP0r6+3XbkUG2itd6vp3oxbtdQLQI94fD5gCS+gnoU=
-k8s.io/apimachinery v0.25.0/go.mod h1:qMx9eAk0sZQGsXGu86fab8tZdffHbwUfsvzqKn4mfB0=
+k8s.io/apimachinery v0.26.1 h1:8EZ/eGJL+hY/MYCNwhmDzVqq2lPl3N3Bo8rvweJwXUQ=
+k8s.io/apimachinery v0.26.1/go.mod h1:tnPmbONNJ7ByJNz9+n9kMjNP8ON+1qoAIIC70lztu74=
 k8s.io/apiserver v0.24.2/go.mod h1:pSuKzr3zV+L+MWqsEo0kHHYwCo77AT5qXbFXP2jbvFI=
 k8s.io/client-go v0.24.2/go.mod h1:zg4Xaoo+umDsfCWr4fCnmLEtQXyCNXCvJuSsglNcV30=
 k8s.io/client-go v0.25.0 h1:CVWIaCETLMBNiTUta3d5nzRbXvY5Hy9Dpl+VvREpu5E=
@@ -1054,15 +1054,15 @@ k8s.io/gengo v0.0.0-20211129171323-c02415ce4185/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAE
 k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
 k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
 k8s.io/klog/v2 v2.60.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
-k8s.io/klog/v2 v2.70.1 h1:7aaoSdahviPmR+XkS7FyxlkkXs6tHISSG03RxleQAVQ=
-k8s.io/klog/v2 v2.70.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
+k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4=
+k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
 k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42/go.mod h1:Z/45zLw8lUo4wdiUkI+v/ImEGAvu3WatcZl3lPMR4Rk=
-k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 h1:MQ8BAZPZlWk3S9K4a9NCkIFQtZShWqoha7snGixVgEA=
-k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1/go.mod h1:C/N6wCaBHeBHkHUesQOQy2/MZqGgMAFPqGsGQLdbZBU=
+k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 h1:+70TFaan3hfJzs+7VK2o+OGxg8HsuBr/5f6tVAjDu6E=
+k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280/go.mod h1:+Axhij7bCpeqhklhUTe3xmOn6bWxolyZEeyaFpjGtl4=
 k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
 k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
-k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed h1:jAne/RjBTyawwAy0utX5eqigAwz/lQhTmy+Hr/Cpue4=
-k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
+k8s.io/utils v0.0.0-20221107191617-1a15be271d1d h1:0Smp/HP1OH4Rvhe+4B8nWGERtlqAGSftbSbbmm45oFs=
+k8s.io/utils v0.0.0-20221107191617-1a15be271d1d/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
 sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.30/go.mod h1:fEO7lRTdivWO2qYVCVG7dEADOMo/MLDCVr8So2g88Uw=
 sigs.k8s.io/controller-runtime v0.12.3 h1:FCM8xeY/FI8hoAfh/V4XbbYMY20gElh9yh+A98usMio=
 sigs.k8s.io/controller-runtime v0.12.3/go.mod h1:qKsk4WE6zW2Hfj0G4v10EnNB2jMG1C+NTb8h+DwCoU0=

pkg/loadbalancer/stream/loadbalancer.go

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2021-2022 Nordix Foundation
+Copyright (c) 2021-2023 Nordix Foundation
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -33,6 +33,7 @@ import (
  "github.com/nordix/meridio/pkg/log"
  "github.com/nordix/meridio/pkg/networking"
  "github.com/nordix/meridio/pkg/retry"
+ "k8s.io/apimachinery/pkg/util/sets"
 )
 
 // LoadBalancer -
@@ -340,31 +341,41 @@ func (lb *LoadBalancer) setTargets(targets []*nspAPI.Target) error {
  return nil
  }
  var errFinal error
- toRemoveTargetsMap := make(map[int]struct{})
- for identifier := range lb.targets {
- toRemoveTargetsMap[identifier] = struct{}{}
- }
- lb.logger.V(2).Info("setTargets", "targets", targets)
- for _, target := range targets { // targets to add
+ newTargetsMap := make(map[int]types.Target)
+ for _, target := range targets {
  t, err := NewTarget(target, lb.netUtils)
  if err != nil {
  continue
  }
- if lb.targetExists(t.GetIdentifier()) {
- delete(toRemoveTargetsMap, t.GetIdentifier())
- } else {
- err = lb.AddTarget(t) // todo: pending targets?
+ newTargetsMap[t.GetIdentifier()] = t
+ }
+ for identifier, target := range lb.targets { // targets to remove
+ newTarget, exists := newTargetsMap[identifier]
+ if !exists {
+ err := lb.RemoveTarget(identifier)
  if err != nil {
  errFinal = fmt.Errorf("%w; %v", errFinal, err)
  }
+ continue
  }
- }
- for identifier := range toRemoveTargetsMap { // targets to remove
+ targetIPSet := sets.New(target.GetIps()...)
+ newTargetIPSet := sets.New(newTarget.GetIps()...)
+ if targetIPSet.Equal(newTargetIPSet) { // have the same IPs?
+ delete(newTargetsMap, identifier)
+ continue
+ }
+ // Have different IPs, so the target IPs have changed and need to be removed and re-added
  err := lb.RemoveTarget(identifier)
  if err != nil {
  errFinal = fmt.Errorf("%w; %v", errFinal, err)
  }
  }
+ for _, target := range newTargetsMap { // targets to add
+ err := lb.AddTarget(target)
+ if err != nil {
+ errFinal = fmt.Errorf("%w; %v", errFinal, err)
+ }
+ }
  return errFinal
 }