fix nil pointer (#3661)

Signed-off-by: bobz965 <zhangbingbing2_yewu@cmss.chinamobile.com>
kubeovn · Jan 23, 2024 · b2f7da5 · b2f7da5
1 parent 51e3291
commit b2f7da5
Showing 1 changed file with 41 additions and 29 deletions.
diff --git a/pkg/controller/vpc_nat_gw_eip.go b/pkg/controller/vpc_nat_gw_eip.go
@@ -266,6 +266,7 @@ func (c *Controller) handleResetIptablesEip(key string) error {
 		if k8serrors.IsNotFound(err) {
 			return nil
 		}
+		klog.Error(err)
 		return err
 	}
 	klog.Infof("handle reset eip %s", key)
@@ -464,6 +465,13 @@ func (c *Controller) addOrUpdateEIPBandtithLimitRules(eip *kubeovnv1.IptablesEIP
 func (c *Controller) addEipQoS(eip *kubeovnv1.IptablesEIP, v4ip string) error {
 	var err error
 	qosPolicy, err := c.qosPoliciesLister.Get(eip.Spec.QoSPolicy)
+	if err != nil {
+		if k8serrors.IsNotFound(err) {
+			return nil
+		}
+		klog.Errorf("failed to get qos policy %s, %v", eip.Spec.QoSPolicy, err)
+		return err
+	}
 	if !qosPolicy.Status.Shared {
 		eips, err := c.iptablesEipsLister.List(
 			labels.SelectorFromSet(labels.Set{util.QoSLabel: qosPolicy.Name}))
@@ -479,10 +487,6 @@ func (c *Controller) addEipQoS(eip *kubeovnv1.IptablesEIP, v4ip string) error {
 			}
 		}
 	}
-	if err != nil {
-		klog.Errorf("get qos policy %s failed: %v", eip.Spec.QoSPolicy, err)
-		return err
-	}
 	return c.addOrUpdateEIPBandtithLimitRules(eip, v4ip, qosPolicy.Status.BandwidthLimitRules)
 }
 
@@ -503,7 +507,10 @@ func (c *Controller) delEipQoS(eip *kubeovnv1.IptablesEIP, v4ip string) error {
 	var err error
 	qosPolicy, err := c.qosPoliciesLister.Get(eip.Status.QoSPolicy)
 	if err != nil {
-		klog.Errorf("get qos policy %s failed: %v", eip.Status.QoSPolicy, err)
+		if k8serrors.IsNotFound(err) {
+			return nil
+		}
+		klog.Errorf("failed to get qos policy %s, %v", eip.Status.QoSPolicy, err)
 		return err
 	}
 
@@ -626,34 +633,37 @@ func (c *Controller) GetGwBySubnet(name string) (string, string, error) {
 }
 
 func (c *Controller) createOrUpdateCrdEip(key, v4ip, v6ip, mac, natGwDp, qos, externalNet string) error {
+	needCreate := false
 	cachedEip, err := c.iptablesEipsLister.Get(key)
-	externalNetwork := util.GetExternalNetwork(cachedEip.Spec.ExternalSubnet)
 	if err != nil {
 		if k8serrors.IsNotFound(err) {
-			klog.V(3).Infof("create eip cr %s", key)
-			_, err := c.config.KubeOvnClient.KubeovnV1().IptablesEIPs().Create(context.Background(), &kubeovnv1.IptablesEIP{
-				ObjectMeta: metav1.ObjectMeta{
-					Name: key,
-					Labels: map[string]string{
-						util.SubnetNameLabel:        externalNet,
-						util.EipV4IpLabel:           v4ip,
-						util.VpcNatGatewayNameLabel: natGwDp,
-					},
-				},
-				Spec: kubeovnv1.IptablesEipSpec{
-					V4ip:       v4ip,
-					V6ip:       v6ip,
-					MacAddress: mac,
-					NatGwDp:    natGwDp,
-				},
-			}, metav1.CreateOptions{})
-			if err != nil {
-				errMsg := fmt.Errorf("failed to create eip crd %s, %v", key, err)
-				klog.Error(errMsg)
-				return errMsg
-			}
+			needCreate = true
 		} else {
-			errMsg := fmt.Errorf("failed to get eip crd %s, %v", key, err)
+			klog.Errorf("failed to get eip %s, %v", key, err)
+			return err
+		}
+	}
+	externalNetwork := util.GetExternalNetwork(cachedEip.Spec.ExternalSubnet)
+	if needCreate {
+		klog.V(3).Infof("create eip cr %s", key)
+		_, err := c.config.KubeOvnClient.KubeovnV1().IptablesEIPs().Create(context.Background(), &kubeovnv1.IptablesEIP{
+			ObjectMeta: metav1.ObjectMeta{
+				Name: key,
+				Labels: map[string]string{
+					util.SubnetNameLabel:        externalNet,
+					util.EipV4IpLabel:           v4ip,
+					util.VpcNatGatewayNameLabel: natGwDp,
+				},
+			},
+			Spec: kubeovnv1.IptablesEipSpec{
+				V4ip:       v4ip,
+				V6ip:       v6ip,
+				MacAddress: mac,
+				NatGwDp:    natGwDp,
+			},
+		}, metav1.CreateOptions{})
+		if err != nil {
+			errMsg := fmt.Errorf("failed to create eip crd %s, %v", key, err)
 			klog.Error(errMsg)
 			return errMsg
 		}
@@ -713,6 +723,7 @@ func (c *Controller) createOrUpdateCrdEip(key, v4ip, v6ip, mac, natGwDp, qos, ex
 		}
 		if needUpdateLabel {
 			if err := c.updateIptableLabels(eip.Name, op, "eip", eip.Labels); err != nil {
+				klog.Errorf("failed to update eip %s labels, %v", eip.Name, err)
 				return err
 			}
 		}
@@ -949,6 +960,7 @@ func (c *Controller) patchEipLabel(eipName string) error {
 	}
 	if needUpdateLabel {
 		if err := c.updateIptableLabels(eip.Name, op, "eip", eip.Labels); err != nil {
+			klog.Errorf("failed to update label of eip %s, %v", eip.Name, err)
 			return err
 		}
 	}