Fixup nil pointer dereference panic

kubernetes · Aug 23, 2024 · 73b55e2 · 73b55e2
1 parent 7f57993
commit 73b55e2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 13 deletions.
diff --git a/pkg/cloudprovider/vsphereparavirtual/controllers/routablepod/node/node_controller.go b/pkg/cloudprovider/vsphereparavirtual/controllers/routablepod/node/node_controller.go
@@ -201,20 +201,14 @@ func (c *Controller) syncNode(key string) error {
 	switch {
 	case apierrors.IsNotFound(err):
 		// node absence in store means watcher caught the deletion, ensure Pod CIDR of this Node is released
-		klog.V(4).Infof("Node %s is not found, releasing Pod CIDR %s", node.Name, node.Spec.PodCIDR)
-		err = c.nsxIPManager.ReleasePodCIDR(node)
+		klog.V(4).Infof("Node %s is not found, releasing its Pod CIDR", name)
+		err = c.nsxIPManager.ReleasePodCIDR(&corev1.Node{ObjectMeta: metav1.ObjectMeta{Name: name}})
 	case err != nil:
-		utilruntime.HandleError(fmt.Errorf("unable to retrieve node %v from store: %v", key, err))
+		utilruntime.HandleError(fmt.Errorf("unable to retrieve node %v from store: %v", name, err))
 	default:
-		if !node.DeletionTimestamp.IsZero() {
-			// node is being deleted, ensure Pod CIDR of this Node is released
-			klog.V(4).Infof("Node %s is being deleted, releasing Pod CIDR %s", node.Name, node.Spec.PodCIDR)
-			err = c.nsxIPManager.ReleasePodCIDR(node)
-		} else {
-			// node exists in store, ensure Pod CIDR of this Node is claimed
-			klog.V(4).Infof("Node %s is found, ensuring Pod CIDR claimed", node.Name)
-			err = c.nsxIPManager.ClaimPodCIDR(node)
-		}
+		// node exists in store, ensure Pod CIDR of this Node is claimed
+		klog.V(4).Infof("Node %s is found, ensuring Pod CIDR claimed", name)
+		err = c.nsxIPManager.ClaimPodCIDR(node)
 	}
 
 	return err

diff --git a/pkg/cloudprovider/vsphereparavirtual/nsxipmanager/nsx_vpc.go b/pkg/cloudprovider/vsphereparavirtual/nsxipmanager/nsx_vpc.go
@@ -26,7 +26,7 @@ type NSXVPCIPManager struct {
 }
 
 func (m *NSXVPCIPManager) createIPAddressAllocation(name string) error {
-	klog.V(4).Infof("Creating IPAddressAllocation CR %s/%s", m.svNamespace, name)
+	klog.V(4).Infof("Creating IPAddressAllocation %s/%s", m.svNamespace, name)
 	ipAddressAllocation := &vpcapisv1.IPAddressAllocation{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      name,
@@ -73,6 +73,7 @@ func (m *NSXVPCIPManager) ReleasePodCIDR(node *corev1.Node) error {
 		return err
 	}
 
+	klog.V(4).Infof("Deleting IPAddressAllocations %s/%s", m.svNamespace, node.Name)
 	return m.client.CrdV1alpha1().IPAddressAllocations(m.svNamespace).Delete(context.Background(), node.Name, metav1.DeleteOptions{})
 }