fix: return early when we might be holding nil references

cloudnativelabs · Apr 14, 2021 · 53cfbe3 · 53cfbe3
1 parent 4efa5cc
commit 53cfbe3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/pkg/controllers/netpol/network_policy_controller.go b/pkg/controllers/netpol/network_policy_controller.go
@@ -484,6 +484,7 @@ func (npc *NetworkPolicyController) Cleanup() {
 	iptablesCmdHandler, err := iptables.New()
 	if err != nil {
 		klog.Errorf("Failed to initialize iptables executor: %s", err.Error())
+		return
 	}
 
 	// delete jump rules in FORWARD chain to pod specific firewall chain
@@ -570,6 +571,7 @@ func (npc *NetworkPolicyController) Cleanup() {
 	ipset, err := utils.NewIPSet(false)
 	if err != nil {
 		klog.Errorf("Failed to clean up ipsets: " + err.Error())
+		return
 	}
 	err = ipset.Save()
 	if err != nil {

diff --git a/pkg/controllers/proxy/service_endpoints_sync.go b/pkg/controllers/proxy/service_endpoints_sync.go
@@ -506,9 +506,6 @@ func (nsc *NetworkServicesController) cleanupStaleIPVSConfig(activeServiceEndpoi
 	// cleanup stale ipvs service and servers
 	klog.V(1).Info("Cleaning up if any, old ipvs service and servers which are no longer needed")
 
-	if err != nil {
-		return errors.New("Failed to list IPVS services: " + err.Error())
-	}
 	var protocol string
 	for _, ipvsSvc := range ipvsSvcs {
 		if ipvsSvc.Protocol == syscall.IPPROTO_TCP {

diff --git a/pkg/controllers/routing/network_routes_controller.go b/pkg/controllers/routing/network_routes_controller.go
@@ -643,6 +643,7 @@ func (nrc *NetworkRoutingController) Cleanup() {
 	ipset, err := utils.NewIPSet(nrc.isIpv6)
 	if err != nil {
 		klog.Errorf("Failed to clean up ipsets: " + err.Error())
+		return
 	}
 	err = ipset.Save()
 	if err != nil {