Merge pull request #121 from mattfenwick/default-label-tests

add test cases for default namespace labels

Author: mattfenwick

hack/kind/run-cyclonus.sh

@@ -8,15 +8,19 @@ CNI=${CNI:-calico}
 CLUSTER_NAME="netpol-$CNI"
 RUN_FROM_SOURCE=${RUN_FROM_SOURCE:-true}
 FROM_SOURCE_ARGS=${FROM_SOURCE_ARGS:-"generate --include conflict --job-timeout-seconds 2"}
+INSTALL_KIND=${INSTALL_KIND:-true}
 
-# install kind if not found
-if ! command -v kind &> /dev/null
-then
+# see https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu2004-README.md
+#   github includes a kind version, but it may not be the version we want
+if [[ $INSTALL_KIND == true ]]; then
   curl -Lo ./kind https://github.com/kubernetes-sigs/kind/releases/download/"${KIND_VERSION}"/kind-$(uname)-amd64
   chmod +x ./kind
   sudo mv kind /usr/local/bin
 fi
 
+kind version
+which -a kind
+
 # create kind cluster
 pushd "$CNI"
   CLUSTER=$CLUSTER_NAME ./setup-kind.sh

pkg/cli/generate.go

@@ -13,6 +13,15 @@ import (
 	"github.com/spf13/cobra"
 )
 
+var (
+	DefaultExcludeTags = []string{
+		generator.TagMultiPeer,
+		generator.TagUpstreamE2E,
+		generator.TagExample,
+		generator.TagEndPort,
+		generator.TagNamespacesByDefaultLabel}
+)
+
 type GenerateArgs struct {
 	AllowDNS                  bool
 	Noisy                     bool
@@ -67,7 +76,7 @@ func SetupGenerateCommand() *cobra.Command {
 	command.Flags().IntVar(&args.JobTimeoutSeconds, "job-timeout-seconds", 10, "number of seconds to pass on to 'agnhost connect --timeout=%ds' flag")
 
 	command.Flags().StringSliceVar(&args.Include, "include", []string{}, "include tests with any of these tags; if empty, all tests will be included.  Valid tags:\n"+strings.Join(generator.TagSlice, "\n"))
-	command.Flags().StringSliceVar(&args.Exclude, "exclude", []string{generator.TagMultiPeer, generator.TagUpstreamE2E, generator.TagExample, generator.TagEndPort}, "exclude tests with any of these tags.  See 'include' field for valid tags")
+	command.Flags().StringSliceVar(&args.Exclude, "exclude", DefaultExcludeTags, "exclude tests with any of these tags.  See 'include' field for valid tags")
 
 	command.Flags().BoolVar(&args.Mock, "mock", false, "if true, use a mock kube runner (i.e. don't actually run tests against kubernetes; instead, product fake results")
 	command.Flags().BoolVar(&args.DryRun, "dry-run", false, "if true, don't actually do anything: just print out what would be done")

pkg/generator/constants.go

@@ -1,6 +1,7 @@
 package generator
 
 import (
+	"github.com/mattfenwick/cyclonus/pkg/kube"
 	v1 "k8s.io/api/core/v1"
 	. "k8s.io/api/networking/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -118,4 +119,5 @@ var (
 			},
 		},
 	}
+	nsZMatchDefaultLabelsSelector = &metav1.LabelSelector{MatchLabels: map[string]string{kube.DefaultNamespaceLabel: "z"}}
 )

pkg/generator/namespacecases.go

@@ -0,0 +1,19 @@
+package generator
+
+import (
+	networkingv1 "k8s.io/api/networking/v1"
+)
+
+func (t *TestCaseGenerator) NamespaceTestCases() []*TestCase {
+	peers := []networkingv1.NetworkPolicyPeer{{NamespaceSelector: nsZMatchDefaultLabelsSelector}}
+	return []*TestCase{
+		NewSingleStepTestCase("ingress: select namespace by default label",
+			NewStringSet(TagNamespacesByDefaultLabel, TagIngress),
+			ProbeAllAvailable,
+			CreatePolicy(BuildPolicy(SetPeers(true, peers)).NetworkPolicy())),
+		NewSingleStepTestCase("egress: select namespace by default label",
+			NewStringSet(TagNamespacesByDefaultLabel, TagEgress),
+			ProbeAllAvailable,
+			CreatePolicy(BuildPolicy(SetPeers(false, peers)).NetworkPolicy())),
+	}
+}

pkg/generator/tags.go

@@ -51,11 +51,12 @@ const (
 )
 
 const (
-	TagAllPods           = "all-pods"
-	TagPodsByLabel       = "pods-by-label"
-	TagAllNamespaces     = "all-namespaces"
-	TagNamespacesByLabel = "namespaces-by-label"
-	TagPolicyNamespace   = "policy-namespace"
+	TagAllPods                  = "all-pods"
+	TagPodsByLabel              = "pods-by-label"
+	TagAllNamespaces            = "all-namespaces"
+	TagNamespacesByLabel        = "namespaces-by-label"
+	TagPolicyNamespace          = "policy-namespace"
+	TagNamespacesByDefaultLabel = "namespaces-by-default-label"
 )
 
 const (
@@ -118,6 +119,7 @@ var AllTags = map[string][]string{
 		TagAllNamespaces,
 		TagNamespacesByLabel,
 		TagPolicyNamespace,
+		TagNamespacesByDefaultLabel,
 	},
 	TagPeerIPBlock: {
 		TagIPBlockNoExcept,

pkg/generator/testcasegenerator.go

@@ -70,6 +70,7 @@ func (t *TestCaseGenerator) GenerateAllTestCases() []*TestCase {
 		t.ExampleTestCases(),
 		t.ActionTestCases(),
 		t.ConflictTestCases(),
+		t.NamespaceTestCases(),
 		t.UpstreamE2ETestCases())
 }
 

pkg/generator/testcasegenerator_tests.go

@@ -18,8 +18,9 @@ func RunTestCaseGeneratorTests() {
 			Expect(len(gen.ExampleTestCases())).To(Equal(1))
 			Expect(len(gen.PortProtocolTestCases())).To(Equal(70))
 			Expect(len(gen.ConflictTestCases())).To(Equal(16))
+			Expect(len(gen.NamespaceTestCases())).To(Equal(2))
 
-			Expect(len(gen.GenerateTestCases())).To(Equal(228))
+			Expect(len(gen.GenerateTestCases())).To(Equal(230))
 		})
 	})
 }

pkg/kube/constants.go

@@ -0,0 +1,5 @@
+package kube
+
+const (
+	DefaultNamespaceLabel = "kubernetes.io/metadata.name"
+)

pkg/kube/ikubernetes.go

@@ -117,7 +117,7 @@ func (m *MockKubernetes) GetNamespace(namespace string) (*v1.Namespace, error) {
 		for k, v := range ns.NamespaceObject.Labels {
 			labels[k] = v
 		}
-		labels["kubernetes.io/metadata.name"] = namespace
+		labels[DefaultNamespaceLabel] = namespace
 		return &v1.Namespace{
 			ObjectMeta: metav1.ObjectMeta{
 				Name:   ns.NamespaceObject.Name,