fix: return new error when no ncs found in nnc crd (#2061)

jaer-tsun · Jaeryn · web-flow · commit dc37cef19e25 · 2023-07-17T17:29:48.000Z
Co-authored-by: Jaeryn &lt;tsch@microsoft.com&gt;
diff --git a/cns/service/main.go b/cns/service/main.go
@@ -1032,9 +1032,11 @@ func reconcileInitialCNSState(ctx context.Context, cli nodeNetworkConfigGetter,
 		return errors.Wrap(err, "failed to init CNS state: failed to get NNC CRD")
 	}
 
+	logger.Printf("Retrieved NNC: %+v", nnc)
+
 	// If there are no NCs, we can't initialize our state and we should fail out.
 	if len(nnc.Status.NetworkContainers) == 0 {
-		return errors.Wrap(err, "failed to init CNS state: no NCs found in NNC CRD")
+		return errors.New("failed to init CNS state: no NCs found in NNC CRD")
 	}
 
 	// For each NC, we need to create a CreateNetworkContainerRequest and use it to rebuild our state.

Original file line number	Diff line number	Diff line change
`@@ -1032,9 +1032,11 @@ func reconcileInitialCNSState(ctx context.Context, cli nodeNetworkConfigGetter,`
`1032`	`1032`	`return errors.Wrap(err, "failed to init CNS state: failed to get NNC CRD")`
`1033`	`1033`	`}`
`1034`	`1034`
	`1035`	`+ logger.Printf("Retrieved NNC: %+v", nnc)`
	`1036`	`+`
`1035`	`1037`	`// If there are no NCs, we can't initialize our state and we should fail out.`
`1036`	`1038`	`if len(nnc.Status.NetworkContainers) == 0 {`
`1037`		`- return errors.Wrap(err, "failed to init CNS state: no NCs found in NNC CRD")`
	`1039`	`+ return errors.New("failed to init CNS state: no NCs found in NNC CRD")`
`1038`	`1040`	`}`
`1039`	`1041`
`1040`	`1042`	`// For each NC, we need to create a CreateNetworkContainerRequest and use it to rebuild our state.`