Skip to content

Commit 6281021

Browse files
committed
use shared_cluster param for update lb
1 parent dd76710 commit 6281021

3 files changed

Lines changed: 11 additions & 9 deletions

File tree

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.21
44

55
require (
66
github.com/onsi/gomega v1.27.6
7-
github.com/serverscom/serverscom-go-client v1.0.6
7+
github.com/serverscom/serverscom-go-client v1.0.7
88
github.com/spf13/pflag v1.0.5
99
go.uber.org/mock v0.4.0
1010
k8s.io/api v0.28.12

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -273,8 +273,8 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR
273273
github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
274274
github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
275275
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
276-
github.com/serverscom/serverscom-go-client v1.0.6 h1:3i3l3K+fo6r83e8I8NbzYvBia2AJ1XRVRRmyFafS5bw=
277-
github.com/serverscom/serverscom-go-client v1.0.6/go.mod h1:X4/JkqDMjEFAqp0hqdRTmcMXc6V2xCitj+kmNyne3/U=
276+
github.com/serverscom/serverscom-go-client v1.0.7 h1:3+Gld2eueCNtUOaHn9DmQ9ABowUpAkAMbZlKxeMFVOg=
277+
github.com/serverscom/serverscom-go-client v1.0.7/go.mod h1:X4/JkqDMjEFAqp0hqdRTmcMXc6V2xCitj+kmNyne3/U=
278278
github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
279279
github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
280280
github.com/soheilhy/cmux v0.1.5 h1:jjzc5WVemNEDTLwv9tlmemhC73tI08BNOIGwBOo10Js=

serverscom/loadbalancers.go

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ func (l *loadBalancers) EnsureLoadBalancer(ctx context.Context, clusterName stri
6868
return nil, err
6969
}
7070

71+
// empty value for cluster id still returns nil
7172
lbClusterID := l.extractLBClusterID(service)
7273

7374
if loadBalancer == nil {
@@ -99,6 +100,9 @@ func (l *loadBalancers) EnsureLoadBalancer(ctx context.Context, clusterName stri
99100
input.UpstreamZones = upstreamZones
100101
input.Name = &name
101102
input.ClusterID = lbClusterID
103+
if lbClusterID == nil {
104+
*input.SharedCluster = true
105+
}
102106

103107
loadBalancer, err = l.client.LoadBalancers.UpdateL4LoadBalancer(ctx, loadBalancer.ID, input)
104108
if err != nil {
@@ -291,12 +295,10 @@ func (l *loadBalancers) buildResult(service *v1.Service, loadBalancer *cli.L4Loa
291295
return &v1.LoadBalancerStatus{Ingress: ingresses}
292296
}
293297

294-
func (l *loadBalancers) extractLBClusterID(service *v1.Service) string {
295-
var clusterID string
296-
297-
if id, ok := service.Annotations[loadBalancerClusterAnnotation]; ok {
298-
clusterID = id
298+
func (l *loadBalancers) extractLBClusterID(service *v1.Service) *string {
299+
if id, ok := service.Annotations[loadBalancerClusterAnnotation]; ok && id != "" {
300+
return &id
299301
}
300302

301-
return clusterID
303+
return nil
302304
}

0 commit comments

Comments
 (0)