Skip to content

Commit 6cc616f

Browse files
committed
Rename LB frontend and backend
1 parent 14b0591 commit 6cc616f

File tree

2 files changed

+17
-9
lines changed

2 files changed

+17
-9
lines changed

internal/service/scaleway/instance/instance.go

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ func (s *Service) Reconcile(ctx context.Context) error {
8080
return fmt.Errorf("failed to ensure control-plane lbs: %w", err)
8181
}
8282

83-
if err := s.ensureControlPlaneLBsACL(ctx, lbs, instanceIPsToStrings(server.PublicIPs)); err != nil {
83+
if err := s.ensureControlPlaneLBsACL(ctx, lbs, instanceIPsToStrings(server.PublicIPs), false); err != nil {
8484
return fmt.Errorf("failed to ensure control-plane lbs acls: %w", err)
8585
}
8686

@@ -127,7 +127,7 @@ func (s *Service) Delete(ctx context.Context) error {
127127
return err
128128
}
129129

130-
if err := s.ensureControlPlaneLBsACL(ctx, lbs, nil); err != nil && !client.IsNotFoundError(err) {
130+
if err := s.ensureControlPlaneLBsACL(ctx, lbs, nil, true); err != nil && !client.IsNotFoundError(err) {
131131
return fmt.Errorf("failed to ensure control-plane lbs acls: %w", err)
132132
}
133133

@@ -413,7 +413,7 @@ func (s *Service) ensureControlPlaneLBs(ctx context.Context, lbs []*lb.LB, nodeI
413413
continue
414414
}
415415

416-
backend, err := s.ScalewayClient.FindBackend(ctx, loadbalancer.Zone, loadbalancer.ID, s.Cluster.ResourceName())
416+
backend, err := s.ScalewayClient.FindBackend(ctx, loadbalancer.Zone, loadbalancer.ID, servicelb.BackendName)
417417
if err != nil {
418418
return err
419419
}
@@ -433,14 +433,19 @@ func (s *Service) ensureControlPlaneLBs(ctx context.Context, lbs []*lb.LB, nodeI
433433
return nil
434434
}
435435

436-
func (s *Service) ensureControlPlaneLBsACL(ctx context.Context, lbs []*lb.LB, publicIPs []string) error {
436+
func (s *Service) ensureControlPlaneLBsACL(ctx context.Context, lbs []*lb.LB, publicIPs []string, delete bool) error {
437437
for _, loadbalancer := range lbs {
438438
if loadbalancer.Status == lb.LBStatusDeleting {
439439
continue
440440
}
441441

442-
frontend, err := s.ScalewayClient.FindFrontend(ctx, loadbalancer.Zone, loadbalancer.ID, s.Cluster.ResourceName())
442+
frontend, err := s.ScalewayClient.FindFrontend(ctx, loadbalancer.Zone, loadbalancer.ID, servicelb.FrontendName)
443443
if err != nil {
444+
// If the frontend is not found, we can skip it when reconciling a deletion.
445+
if delete && client.IsNotFoundError(err) {
446+
continue
447+
}
448+
444449
return err
445450
}
446451

internal/service/scaleway/lb/lb.go

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ const (
3232
// Backend port, must match port of apiservers.
3333
backendControlPlanePort = 6443
3434

35+
BackendName = "kube-apiserver"
36+
FrontendName = "kube-apiserver"
37+
3538
// ACL indexes.
3639
aclIndex = 0
3740
denyAllACLIndex = math.MaxInt32
@@ -367,7 +370,7 @@ func (s *Service) getOrCreateBackend(
367370
) (*lb.Backend, error) {
368371
servers = slices.Sorted(slices.Values(servers))
369372

370-
backend, err := s.ScalewayClient.FindBackend(ctx, lb.Zone, lb.ID, s.ResourceName())
373+
backend, err := s.ScalewayClient.FindBackend(ctx, lb.Zone, lb.ID, BackendName)
371374
if err := utilerrors.FilterOut(err, client.IsNotFoundError); err != nil {
372375
return nil, err
373376
}
@@ -377,7 +380,7 @@ func (s *Service) getOrCreateBackend(
377380
ctx,
378381
lb.Zone,
379382
lb.ID,
380-
s.ResourceName(),
383+
BackendName,
381384
servers,
382385
backendControlPlanePort,
383386
)
@@ -423,7 +426,7 @@ func (s *Service) ensureFrontend(ctx context.Context, backends []*lb.Backend) (m
423426
frontend, err := s.ScalewayClient.FindFrontend(
424427
ctx, backend.LB.Zone,
425428
backend.LB.ID,
426-
s.ResourceName(),
429+
FrontendName,
427430
)
428431
if err := utilerrors.FilterOut(err, client.IsNotFoundError); err != nil {
429432
return nil, err
@@ -434,7 +437,7 @@ func (s *Service) ensureFrontend(ctx context.Context, backends []*lb.Backend) (m
434437
ctx,
435438
backend.LB.Zone,
436439
backend.LB.ID,
437-
s.ResourceName(),
440+
FrontendName,
438441
backend.ID,
439442
s.ControlPlaneLoadBalancerPort(),
440443
)

0 commit comments

Comments
 (0)