nil error fix

Author: Joseph Chen

internal/controllers/admin_policy_controller.go

@@ -84,7 +84,7 @@ type adminPolicyReconciler struct {
 //+kubebuilder:rbac:groups="policy.networking.k8s.io",resources=adminnetworkpolicies,verbs=get;list;watch;update;patch
 
 func (r *adminPolicyReconciler) Reconcile(ctx context.Context, request reconcile.Request) (reconcile.Result, error) {
-	r.logger.Info("Got reconcile request", "resource", request)
+	r.logger.Info("Got adminn reconcile request", "resource", request)
 	return ctrl.Result{}, r.reconcile(ctx, request)
 }
 

pkg/resolvers/endpoints.go

@@ -122,7 +122,7 @@ func (r *defaultEndpointsResolver) computeEgressEndpoints(ctx context.Context, p
 				egressEndpoints = append(egressEndpoints, r.getAllowAllNetworkPeers(ctx, policy, rule.Ports, networking.PolicyTypeEgress)...)
 				continue
 			}
-			resolvedPeers, err := r.resolveNetworkPeers(ctx, policy, adminpolicy, rule.To, rule.Ports, nil, nil, nil, networking.PolicyTypeEgress, "Allow", isAdmin)
+			resolvedPeers, err := r.resolveNetworkPeers(ctx, policy, nil, rule.To, rule.Ports, nil, nil, nil, networking.PolicyTypeEgress, "Allow", isAdmin)
 			if err != nil {
 				return nil, errors.Wrap(err, "unable to resolve egress network peers")
 			}
@@ -575,8 +575,8 @@ func (r *defaultEndpointsResolver) getMatchingPodAddresses(ctx context.Context,
 		r.logger.Info("Unable to List Pods", "err", err)
 		return nil
 	}
-	r.logger.V(1).Info("Got pods for label selector", "count", len(podList.Items), "selector", ls.String())
-
+	r.logger.Info("Got pods for label selector", "count", len(podList.Items), "selector", ls.String())
+	r.logger.Info("Namepsace", "namespace", namespace)
 	for _, pod := range podList.Items {
 		podIP := k8s.GetPodIP(&pod)
 		if len(podIP) == 0 {

pkg/resolvers/policies_for_pod.go

@@ -97,13 +97,14 @@ func (r *defaultPolicyReferenceResolver) getReferredPoliciesForPod(ctx context.C
 		}
 		isPolicyReferred := false
 		isAdminPolicyReferred := false
-		if r.isPodReferredOnIngressEgress(ctx, pod, policy, nil, false) {
+		if isPolicyFound && r.isPodReferredOnIngressEgress(ctx, pod, policy, nil, false) {
 			referredPolicies = append(referredPolicies, *policy)
 			processedPolicies.Insert(k8s.NamespacedName(policy))
 			isPolicyReferred = true
 			// continue
 		}
-		if r.isPodReferredOnIngressEgress(ctx, pod, nil, adminPolicy, true) {
+
+		if isAdminPolicyFound && r.isPodReferredOnIngressEgress(ctx, pod, nil, adminPolicy, true) {
 			referredAdminPolicies = append(referredAdminPolicies, *adminPolicy)
 			processedPolicies.Insert(k8s.NamespacedName(adminPolicy))
 			isAdminPolicyReferred = false
@@ -112,21 +113,21 @@ func (r *defaultPolicyReferenceResolver) getReferredPoliciesForPod(ctx context.C
 		if isPolicyReferred && isAdminPolicyReferred {
 			continue
 		} else if isAdminPolicyReferred {
-			if podOld != nil && r.isPodReferredOnIngressEgress(ctx, podOld, policy, nil, false) {
+			if podOld != nil && isPolicyFound && r.isPodReferredOnIngressEgress(ctx, podOld, policy, nil, false) {
 				referredPolicies = append(referredPolicies, *policy)
 				processedPolicies.Insert(k8s.NamespacedName(policy))
 			}
 		} else if isPolicyReferred {
-			if podOld != nil && r.isPodReferredOnIngressEgress(ctx, podOld, nil, adminPolicy, true) {
+			if podOld != nil && isAdminPolicyFound && r.isPodReferredOnIngressEgress(ctx, podOld, nil, adminPolicy, true) {
 				referredAdminPolicies = append(referredAdminPolicies, *adminPolicy)
 				processedPolicies.Insert(k8s.NamespacedName(adminPolicy))
 			}
 		} else {
-			if podOld != nil && r.isPodReferredOnIngressEgress(ctx, podOld, policy, nil, false) {
+			if podOld != nil && isPolicyFound && r.isPodReferredOnIngressEgress(ctx, podOld, policy, nil, false) {
 				referredPolicies = append(referredPolicies, *policy)
 				processedPolicies.Insert(k8s.NamespacedName(policy))
 			}
-			if podOld != nil && r.isPodReferredOnIngressEgress(ctx, podOld, nil, adminPolicy, true) {
+			if podOld != nil && isAdminPolicyFound && r.isPodReferredOnIngressEgress(ctx, podOld, nil, adminPolicy, true) {
 				referredAdminPolicies = append(referredAdminPolicies, *adminPolicy)
 				processedPolicies.Insert(k8s.NamespacedName(adminPolicy))
 			}
@@ -169,9 +170,6 @@ func (r *defaultPolicyReferenceResolver) isPodMatchesPolicySelector(pod *corev1.
 
 func (r *defaultPolicyReferenceResolver) isPodReferredOnIngressEgress(ctx context.Context, pod *corev1.Pod, policy *networking.NetworkPolicy, adminPolicy *adminnetworking.AdminNetworkPolicy, isAdmin bool) bool {
 	if isAdmin {
-		if adminPolicy == nil {
-			return false
-		}
 		namepsaces, _ := r.podSelectorNamespaces(ctx, adminPolicy)
 		for _, ns := range namepsaces {
 			for _, ingRule := range adminPolicy.Spec.Ingress {