Merge pull request #493 from Fish-pro/chore/unparam

Clean up nil error returns for the functions

Author: k8s-ci-robot

pkg/networkaware/networkoverhead/networkoverhead.go

@@ -182,10 +182,7 @@ func (no *NetworkOverhead) PreFilter(ctx context.Context, state *framework.Cycle
 	}
 
 	// Get AppGroup CR
-	appGroup, err := no.findAppGroupNetworkOverhead(agName)
-	if err != nil {
-		return nil, framework.NewStatus(framework.Success, "Error while returning AppGroup, return")
-	}
+	appGroup := no.findAppGroupNetworkOverhead(agName)
 
 	// Get NetworkTopology CR
 	networkTopology, err := no.findNetworkTopologyNetworkOverhead()
@@ -615,9 +612,8 @@ func getPreFilterState(cycleState *framework.CycleState) (*PreFilterState, error
 	return state, nil
 }
 
-func (no *NetworkOverhead) findAppGroupNetworkOverhead(agName string) (*agv1alpha1.AppGroup, error) {
+func (no *NetworkOverhead) findAppGroupNetworkOverhead(agName string) *agv1alpha1.AppGroup {
 	klog.V(6).InfoS("namespaces: %s", no.namespaces)
-	var err error
 	for _, namespace := range no.namespaces {
 		klog.V(6).InfoS("ag.lister: %v", no.agLister)
 
@@ -628,10 +624,10 @@ func (no *NetworkOverhead) findAppGroupNetworkOverhead(agName string) (*agv1alph
 			continue
 		}
 		if appGroup != nil {
-			return appGroup, nil
+			return appGroup
 		}
 	}
-	return nil, err
+	return nil
 }
 
 func (no *NetworkOverhead) findNetworkTopologyNetworkOverhead() (*ntv1alpha1.NetworkTopology, error) {

pkg/noderesourcetopology/filter_test.go

@@ -1231,16 +1231,8 @@ func cloneResourceList(rl v1.ResourceList) v1.ResourceList {
 func parseTestUserEntry(entries []testUserEntry) []testEntry {
 	var teList []testEntry
 	for i, e := range entries {
-		irl, err := parseContainerRes(e.initCntReq)
-		if err != nil {
-			panic(fmt.Errorf("cannot parse entry: %q, error: %v", e.description, err))
-		}
-
-		rl, err := parseContainerRes(e.cntReq)
-		if err != nil {
-			panic(fmt.Errorf("cannot parse entry: %q, error: %v", e.description, err))
-		}
-
+		irl := parseContainerRes(e.initCntReq)
+		rl := parseContainerRes(e.cntReq)
 		pod := makePod(fmt.Sprintf("testpod%d", i), withMultiInitContainers(irl), withMultiContainers(rl))
 		te := testEntry{
 			name:       e.description,
@@ -1252,7 +1244,7 @@ func parseTestUserEntry(entries []testUserEntry) []testEntry {
 	return teList
 }
 
-func parseContainerRes(cntRes []map[string]string) ([]v1.ResourceList, error) {
+func parseContainerRes(cntRes []map[string]string) []v1.ResourceList {
 	rll := []v1.ResourceList{}
 	for i := 0; i < len(cntRes); i++ {
 		resMap := cntRes[i]
@@ -1264,7 +1256,7 @@ func parseContainerRes(cntRes []map[string]string) ([]v1.ResourceList, error) {
 		rll = append(rll, rl)
 	}
 
-	return rll, nil
+	return rll
 }
 
 func parseState(error string) *framework.Status {