Merge pull request #557 from ctreatma/bgp-npe

🐛 Check for non-nil response when enabling BGP
kubernetes-sigs · Apr 4, 2023 · d069654 · d069654
2 parents 3ffd9b2 + 2fdc247
commit d069654
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/controllers/packetmachine_controller.go b/controllers/packetmachine_controller.go
@@ -365,7 +365,7 @@ func (r *PacketMachineReconciler) reconcile(ctx context.Context, machineScope *s
 	if machineScope.PacketCluster.Spec.VIPManager == "KUBE_VIP" {
 		if err := r.PacketClient.EnsureNodeBGPEnabled(dev.ID); err != nil {
 			// Do not treat an error enabling bgp on machine as fatal
-			return ctrl.Result{RequeueAfter: time.Second * 20}, fmt.Errorf("failed to enable bpg on machine %s: %w", machineScope.Name(), err)
+			return ctrl.Result{RequeueAfter: time.Second * 20}, fmt.Errorf("failed to enable bgp on machine %s: %w", machineScope.Name(), err)
 		}
 	}
 

diff --git a/pkg/cloud/packet/client.go b/pkg/cloud/packet/client.go
@@ -297,7 +297,7 @@ func (p *Client) EnsureNodeBGPEnabled(id string) error {
 	_, response, err := p.BGPSessions.Create(id, req)
 	// if we already had one, then we can ignore the error
 	// this really should be a 409, but 422 is what is returned
-	if response.StatusCode == 422 && strings.Contains(fmt.Sprintf("%s", err), "already has session") {
+	if response != nil && response.StatusCode == 422 && strings.Contains(fmt.Sprintf("%s", err), "already has session") {
 		err = nil
 	}
 	return err