Merge pull request #954 from abstractmj/v1.20.x

fix: fix nil pointer error when clbingress is invalid; issue #953
TencentBlueKing · Aug 24, 2021 · f7f03fd · f7f03fd
2 parents 65c57f1 + 0b7fb29
commit f7f03fd
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/bcs-services/bcs-clb-controller/pkg/processor/updater.go b/bcs-services/bcs-clb-controller/pkg/processor/updater.go
@@ -410,14 +410,14 @@ func (updater *Updater) validateClbIngress(ingressList []*ingressType.ClbIngress
 		for _, tmpTCPRule := range tmpIngress.Spec.TCP {
 			err := tmpTCPRule.Validate()
 			if err != nil {
+				blog.Errorf("rule %s validate failed, err %s", tmpTCPRule.ToString(), err.Error())
 				tmpIngress.SetStatusMessage(ingressType.ClbIngressStatusAbnormal,
 					fmt.Sprintf("rule %s validate failed, err %s", tmpTCPRule.ToString(), err.Error()))
 				err = updater.ingressRegistry.SetIngress(tmpIngress)
 				if err != nil {
 					blog.Warnf("set ingress %s/%s failed, err %s",
 						tmpIngress.GetNamespace(), tmpIngress.GetName(), err.Error())
 				}
-				blog.Errorf("rule %s validate failed, err %s", tmpTCPRule.ToString(), err.Error())
 				return false
 			}
 			err = updater.validateFourLayerRuleConflict(tmpTCPRule, fourLayerMap, sevenLayerMap)
@@ -435,14 +435,14 @@ func (updater *Updater) validateClbIngress(ingressList []*ingressType.ClbIngress
 		for _, tmpUDPRule := range tmpIngress.Spec.UDP {
 			err := tmpUDPRule.Validate()
 			if err != nil {
+				blog.Errorf("rule %s validate failed, err %s", tmpUDPRule.ToString(), err.Error())
 				tmpIngress.SetStatusMessage(ingressType.ClbIngressStatusAbnormal,
 					fmt.Sprintf("rule %s validate failed, err %s", tmpUDPRule.ToString(), err.Error()))
 				err = updater.ingressRegistry.SetIngress(tmpIngress)
 				if err != nil {
 					blog.Warnf("set ingress %s/%s failed, err %s",
 						tmpIngress.GetNamespace(), tmpIngress.GetName(), err.Error())
 				}
-				blog.Errorf("rule %s validate failed, err %s", tmpUDPRule.ToString(), err.Error())
 				return false
 			}
 			err = updater.validateFourLayerRuleConflict(tmpUDPRule, fourLayerMap, sevenLayerMap)
@@ -460,14 +460,14 @@ func (updater *Updater) validateClbIngress(ingressList []*ingressType.ClbIngress
 		for _, tmpHTTPRule := range tmpIngress.Spec.HTTP {
 			err := tmpHTTPRule.ValidateHTTP()
 			if err != nil {
+				blog.Errorf("rule %s validate failed, err %s", tmpHTTPRule.ToString(), err.Error())
 				tmpIngress.SetStatusMessage(ingressType.ClbIngressStatusAbnormal,
 					fmt.Sprintf("rule %s validate failed, err %s", tmpHTTPRule.ToString(), err.Error()))
 				err = updater.ingressRegistry.SetIngress(tmpIngress)
 				if err != nil {
 					blog.Warnf("set ingress %s/%s failed, err %s",
 						tmpIngress.GetNamespace(), tmpIngress.GetName(), err.Error())
 				}
-				blog.Errorf("rule %s validate failed, err %s", tmpHTTPRule.ToString(), err.Error())
 				return false
 			}
 			err = updater.validateSevenLayerRuleConflict(tmpHTTPRule, fourLayerMap, sevenLayerMap)
@@ -485,14 +485,14 @@ func (updater *Updater) validateClbIngress(ingressList []*ingressType.ClbIngress
 		for _, tmpHTTPSRule := range tmpIngress.Spec.HTTPS {
 			err := tmpHTTPSRule.ValidateHTTPS()
 			if err != nil {
+				blog.Errorf("rule %s validate failed, err %s", tmpHTTPSRule.ToString(), err.Error())
 				tmpIngress.SetStatusMessage(ingressType.ClbIngressStatusAbnormal,
 					fmt.Sprintf("rule %s validate failed, err %s", tmpHTTPSRule.ToString(), err.Error()))
 				err = updater.ingressRegistry.SetIngress(tmpIngress)
 				if err != nil {
 					blog.Warnf("set ingress %s/%s failed, err %s",
 						tmpIngress.GetNamespace(), tmpIngress.GetName(), err.Error())
 				}
-				blog.Errorf("rule %s validate failed, err %s", tmpHTTPSRule.ToString(), err.Error())
 				return false
 			}
 			err = updater.validateSevenLayerRuleConflict(tmpHTTPSRule, fourLayerMap, sevenLayerMap)
@@ -508,7 +508,6 @@ func (updater *Updater) validateClbIngress(ingressList []*ingressType.ClbIngress
 		}
 		if err := updater.validateStatefulSetIngress(
 			tmpIngress.Spec.StatefulSet, fourLayerMap, sevenLayerMap); err != nil {
-
 			tmpIngress.SetStatusMessage(ingressType.ClbIngressStatusAbnormal, err.Error())
 			err = updater.ingressRegistry.SetIngress(tmpIngress)
 			if err != nil {