From f51347feacf0c127269b496f67d89f1272b3c825 Mon Sep 17 00:00:00 2001 From: Martynas Pumputis Date: Tue, 7 Nov 2017 15:40:06 +0200 Subject: [PATCH] npc: Address PR comments * Add comments about presence of `analysePolicyLegacy` and `analysePolicy`. * Use non-legacy netpol in TestRegressionPolicyNamespaceOrdering3059. --- npc/analyser.go | 4 ++++ npc/controller_test.go | 15 +++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/npc/analyser.go b/npc/analyser.go index 2a51356a..2ad440fc 100644 --- a/npc/analyser.go +++ b/npc/analyser.go @@ -11,6 +11,10 @@ import ( "github.com/weaveworks/weave/npc/ipset" ) +// analysePolicyLegacy is used to analyse extensions/v1beta1/NetworkPolicy (legacy) and +// implements pre-1.7 k8s netpol semantics, whilst analysePolicy - networking.k8s.io/v1/NetworkPolicy +// and 1.7 semantics. + func (ns *ns) analysePolicyLegacy(policy *extnapi.NetworkPolicy) ( rules map[string]*ruleSpec, nsSelectors, podSelectors map[string]*selectorSpec, diff --git a/npc/controller_test.go b/npc/controller_test.go index 314fb3e7..9557f443 100644 --- a/npc/controller_test.go +++ b/npc/controller_test.go @@ -8,7 +8,6 @@ import ( "github.com/stretchr/testify/require" "github.com/weaveworks/weave/npc/ipset" coreapi "k8s.io/api/core/v1" - extnapi "k8s.io/api/extensions/v1beta1" networkingv1 "k8s.io/api/networking/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" @@ -151,15 +150,15 @@ func TestRegressionPolicyNamespaceOrdering3059(t *testing.T) { port := intstr.FromInt(12345) - networkPolicy := &extnapi.NetworkPolicy{ + networkPolicy := &networkingv1.NetworkPolicy{ ObjectMeta: metav1.ObjectMeta{ Name: "network-policy", Namespace: "destination", }, - Spec: extnapi.NetworkPolicySpec{ - Ingress: []extnapi.NetworkPolicyIngressRule{ + Spec: networkingv1.NetworkPolicySpec{ + Ingress: []networkingv1.NetworkPolicyIngressRule{ { - From: []extnapi.NetworkPolicyPeer{ + From: []networkingv1.NetworkPolicyPeer{ { NamespaceSelector: &metav1.LabelSelector{ MatchLabels: map[string]string{ @@ -168,7 +167,7 @@ func TestRegressionPolicyNamespaceOrdering3059(t *testing.T) { }, }, }, - Ports: []extnapi.NetworkPolicyPort{ + Ports: []networkingv1.NetworkPolicyPort{ { Port: &port, }, @@ -180,7 +179,7 @@ func TestRegressionPolicyNamespaceOrdering3059(t *testing.T) { // Namespaces first m := newMockIPSet() - controller := New("foo", true, &mockIPTables{}, &m) + controller := New("foo", false, &mockIPTables{}, &m) const ( selectorIPSetName = "weave-I239Zp%sCvoVt*D6u=A!2]YEk" @@ -196,7 +195,7 @@ func TestRegressionPolicyNamespaceOrdering3059(t *testing.T) { // NetworkPolicy first m = newMockIPSet() - controller = New("foo", true, &mockIPTables{}, &m) + controller = New("foo", false, &mockIPTables{}, &m) controller.AddNetworkPolicy(networkPolicy)