Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

✨ Add EMLB deletion #771

Merged
merged 10 commits into from
Jun 18, 2024
Merged

✨ Add EMLB deletion #771

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ed3442f
feat: delete load balancers when clusters are deleted
cprivitere May 30, 2024
f3ee310
feat: add finalizer code
cprivitere Jun 3, 2024
ba20443
fix: move from switch to if
cprivitere Jun 7, 2024
e61b829
feat: add emlb deletion to machien controller
cprivitere Jun 7, 2024
cebd848
fix: move forward even though there are errors
cprivitere Jun 7, 2024
9eb2812
chore: remove origin and port deletions as they were unnecessary
cprivitere Jun 10, 2024
f3215df
refactor: ignore 404 errors while deleting load balancers
cprivitere Jun 12, 2024
70b4b26
refactor: take marques suggestion to remove unnecessary get calls
cprivitere Jun 17, 2024
0817226
chore(lint): fix lint errors
cprivitere Jun 17, 2024
53f1647
Apply suggestions from code review
cprivitere Jun 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 20 additions & 22 deletions internal/emlb/emlb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ func (e *EMLB) ReconcileVIPOrigin(ctx context.Context, machineScope *scope.Machi
}

// Fetch the Load Balancer object.
lb, err := e.getLoadBalancer(ctx, lbID)
lb, _, err := e.getLoadBalancer(ctx, lbID)
if err != nil {
return err
}
Expand Down Expand Up @@ -247,18 +247,18 @@ func (e *EMLB) DeleteLoadBalancer(ctx context.Context, clusterScope *scope.Clust
return nil
}

log.Info("Deleting EMLB", "Cluster Metro", e.metro, "Cluster Name", clusterName, "Project ID", e.projectID, "Load Balancer ID", lbID)

// Fetch the Load Balancer object.
// Skip if 404, otherwise error
displague marked this conversation as resolved.
Show resolved Hide resolved
lb, err := e.getLoadBalancer(ctx, lbID)
if err != nil {
log.Error(err, "failed to load the loadbalancer object, cannot proceed with deletion")
lb, resp, err := e.getLoadBalancer(ctx, lbID)
if err != nil && (resp.StatusCode != http.StatusNotFound) {
displague marked this conversation as resolved.
Show resolved Hide resolved
log.Error(err, "unexpected error while loading the loadbalancer object, cannot proceed with deletion")
return err
}

resp, err := e.deleteLoadBalancer(ctx, lb.GetId())
if err != nil {
log.Info("Deleting EMLB", "Cluster Metro", e.metro, "Cluster Name", clusterName, "Project ID", e.projectID, "Load Balancer ID", lbID)

resp, err = e.deleteLoadBalancer(ctx, lb.GetId())
if err != nil && (resp.StatusCode != http.StatusNotFound) {
log.Error(err, "LB Delete Failed", "EMLB ID", lb.GetId(), "Response Body", resp.Body)
return err
cprivitere marked this conversation as resolved.
Show resolved Hide resolved
}
Expand All @@ -279,19 +279,17 @@ func (e *EMLB) DeleteLoadBalancerOrigin(ctx context.Context, machineScope *scope
return fmt.Errorf("no Equinix Metal Load Balancer Pool found in machine's annotations")
}

log.Info("Deleting EMLB Origin from Pool", "Cluster Metro", e.metro, "Cluster Name", clusterName, "Project ID", e.projectID, "Pool ID", lbPoolID)

// Fetch the Load Balancer Pool object.
lbPool, err := e.getLoadBalancerPool(ctx, lbPoolID)
if err != nil {
log.Error(err, "failed to load the loadbalancer pool object, cannot proceed with deletion")
lbPool, resp, err := e.getLoadBalancerPool(ctx, lbPoolID)
if err != nil && (resp.StatusCode != http.StatusNotFound) {
log.Error(err, "unexpected error while loading the loadbalancer pool object, cannot proceed with deletion")
return err
}

log.Info("Deleting EMLB Pool", "Cluster Metro", e.metro, "Cluster Name", clusterName, "Project ID", e.projectID, "Pool ID", lbPoolID)

resp, err := e.deletePool(ctx, lbPool.GetId())
if err != nil {
resp, err = e.deletePool(ctx, lbPool.GetId())
if err != nil && (resp.StatusCode != http.StatusNotFound) {
log.Error(err, "LB Pool Delete Failed", "Pool ID", lbPool.GetId(), "Response Body", resp.Body)
return err
cprivitere marked this conversation as resolved.
Show resolved Hide resolved
}
Expand All @@ -300,11 +298,11 @@ func (e *EMLB) DeleteLoadBalancerOrigin(ctx context.Context, machineScope *scope
}

// getLoadBalancer Returns a Load Balancer object given an id.
func (e *EMLB) getLoadBalancer(ctx context.Context, id string) (*lbaas.LoadBalancer, error) {
func (e *EMLB) getLoadBalancer(ctx context.Context, id string) (*lbaas.LoadBalancer, *http.Response, error) {
ctx = context.WithValue(ctx, lbaas.ContextOAuth2, e.tokenExchanger)

LoadBalancer, _, err := e.client.LoadBalancersApi.GetLoadBalancer(ctx, id).Execute()
return LoadBalancer, err
LoadBalancer, resp, err := e.client.LoadBalancersApi.GetLoadBalancer(ctx, id).Execute()
return LoadBalancer, resp, err
}

// getLoadBalancerPort Returns a Load Balancer Port object given an id.
Expand All @@ -316,11 +314,11 @@ func (e *EMLB) getLoadBalancerPort(ctx context.Context, id string, portNumber in
}

// getLoadBalancerPool Returns a Load Balancer Pool object given an id.
func (e *EMLB) getLoadBalancerPool(ctx context.Context, id string) (*lbaas.LoadBalancerPool, error) {
func (e *EMLB) getLoadBalancerPool(ctx context.Context, id string) (*lbaas.LoadBalancerPool, *http.Response, error) {
ctx = context.WithValue(ctx, lbaas.ContextOAuth2, e.tokenExchanger)

LoadBalancerPool, _, err := e.client.PoolsApi.GetLoadBalancerPool(ctx, id).Execute()
return LoadBalancerPool, err
LoadBalancerPool, resp, err := e.client.PoolsApi.GetLoadBalancerPool(ctx, id).Execute()
return LoadBalancerPool, resp, err
}

// EnsureLoadBalancerOrigin takes the devices list of IP addresses in a Load Balancer Origin Pool and ensures an origin
Expand Down Expand Up @@ -424,7 +422,7 @@ func (e *EMLB) ensureLoadBalancer(ctx context.Context, lbID, lbname string, port
}

// Regardless of whether we just created it, fetch the loadbalancer object.
lb, err := e.getLoadBalancer(ctx, lbID)
lb, _, err := e.getLoadBalancer(ctx, lbID)
if err != nil {
return nil, nil, err
}
Expand Down