diff --git a/libcalico-go/lib/backend/k8s/conversion/conversion.go b/libcalico-go/lib/backend/k8s/conversion/conversion.go index 842e5e5db19..bca4bf6aa9c 100644 --- a/libcalico-go/lib/backend/k8s/conversion/conversion.go +++ b/libcalico-go/lib/backend/k8s/conversion/conversion.go @@ -670,7 +670,7 @@ func (c converter) K8sNetworkPolicyToCalico(np *networkingv1.NetworkPolicy) (*mo // Generate the ingress rules list. var ingressRules []apiv3.Rule for _, r := range np.Spec.Ingress { - rules, err := c.k8sRuleToCalico(r.From, r.Ports, np.Namespace, true) + rules, err := c.k8sRuleToCalico(r.From, r.Ports, true) if err != nil { log.WithError(err).Warn("dropping k8s rule that couldn't be converted.") // Add rule to conversion error slice @@ -683,7 +683,7 @@ func (c converter) K8sNetworkPolicyToCalico(np *networkingv1.NetworkPolicy) (*mo // Generate the egress rules list. var egressRules []apiv3.Rule for _, r := range np.Spec.Egress { - rules, err := c.k8sRuleToCalico(r.To, r.Ports, np.Namespace, false) + rules, err := c.k8sRuleToCalico(r.To, r.Ports, false) if err != nil { log.WithError(err).Warn("dropping k8s rule that couldn't be converted") // Add rule to conversion error slice @@ -817,7 +817,7 @@ func k8sSelectorToCalico(s *metav1.LabelSelector, selectorType selectorType) str return strings.Join(selectors, " && ") } -func (c converter) k8sRuleToCalico(rPeers []networkingv1.NetworkPolicyPeer, rPorts []networkingv1.NetworkPolicyPort, ns string, ingress bool) ([]apiv3.Rule, error) { +func (c converter) k8sRuleToCalico(rPeers []networkingv1.NetworkPolicyPeer, rPorts []networkingv1.NetworkPolicyPort, ingress bool) ([]apiv3.Rule, error) { rules := []apiv3.Rule{} peers := []*networkingv1.NetworkPolicyPeer{} ports := []*networkingv1.NetworkPolicyPort{} @@ -911,7 +911,7 @@ func (c converter) k8sRuleToCalico(rPeers []networkingv1.NetworkPolicyPeer, rPor } for _, peer := range peers { - selector, nsSelector, nets, notNets := c.k8sPeerToCalicoFields(peer, ns) + selector, nsSelector, nets, notNets := c.k8sPeerToCalicoFields(peer) if ingress { // Build inbound rule and append to list. rules = append(rules, apiv3.Rule{ @@ -1038,7 +1038,7 @@ func k8sProtocolToCalico(protocol *kapiv1.Protocol) *numorstring.Protocol { return nil } -func (c converter) k8sPeerToCalicoFields(peer *networkingv1.NetworkPolicyPeer, ns string) (selector, nsSelector string, nets []string, notNets []string) { +func (c converter) k8sPeerToCalicoFields(peer *networkingv1.NetworkPolicyPeer) (selector, nsSelector string, nets []string, notNets []string) { // If no peer, return zero values for all fields (selector, nets and !nets). if peer == nil { return diff --git a/libcalico-go/lib/backend/k8s/conversion/conversion_test.go b/libcalico-go/lib/backend/k8s/conversion/conversion_test.go index 6203a8842c5..a1dbf53d03c 100644 --- a/libcalico-go/lib/backend/k8s/conversion/conversion_test.go +++ b/libcalico-go/lib/backend/k8s/conversion/conversion_test.go @@ -2697,7 +2697,7 @@ var _ = Describe("Test NetworkPolicy conversion", func() { } // Parse the policy. - podSel, nsSel, nets, notNets := c.(*converter).k8sPeerToCalicoFields(&np, "default") + podSel, nsSel, nets, notNets := c.(*converter).k8sPeerToCalicoFields(&np) // Assert value fields are correct. Expect(nets[0]).To(Equal("192.168.0.0/16")) @@ -2716,7 +2716,7 @@ var _ = Describe("Test NetworkPolicy conversion", func() { } // Parse the policy. - podSel, nsSel, nets, notNets := c.(*converter).k8sPeerToCalicoFields(&np, "default") + podSel, nsSel, nets, notNets := c.(*converter).k8sPeerToCalicoFields(&np) // Assert value fields are correct. Expect(nets).To(BeNil()) @@ -2736,7 +2736,7 @@ var _ = Describe("Test NetworkPolicy conversion", func() { } // Parse the policy. - podSel, nsSel, nets, notNets := c.(*converter).k8sPeerToCalicoFields(&np, "default") + podSel, nsSel, nets, notNets := c.(*converter).k8sPeerToCalicoFields(&np) // Assert value fields are correct. Expect(nets[0]).To(Equal("192.168.0.0/16"))