Skip to content
This repository was archived by the owner on Jul 11, 2023. It is now read-only.

feat(e2e): ensures namespace ignore label takes precedence #4073

Merged
merged 2 commits into from
Sep 9, 2021
Merged

feat(e2e): ensures namespace ignore label takes precedence #4073

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5cd25cb
feat(e2e): ensures namespace ignore label takes precedence
jaellio Sep 2, 2021
e49b267
Only test ignore label
jaellio Sep 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
197 changes: 197 additions & 0 deletions tests/e2e/e2e_ignore_namespace_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,197 @@
package e2e

import (
"context"
"time"

. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
corev1 "k8s.io/api/core/v1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"

"github.com/openservicemesh/osm/pkg/constants"
. "github.com/openservicemesh/osm/tests/framework"
)

var _ = OSMDescribe("Ignore Namespaces",
OSMDescribeInfo{
Tier: 1,
Bucket: 2,
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will update to Tier: 2 after PR review is complete

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The Tier doesn't matter anymore. All tests run for PR workflows.

},
func() {
Context("Ignore Label", func() {
const ignoreNs = "ignore"
const monitorIgnoreNs = "mesh-ignore"
const sidecarMonitorIgnoreNs = "sidecar-monitor-ignore"
var ns []string = []string{ignoreNs, monitorIgnoreNs, sidecarMonitorIgnoreNs}

It("Tests the ignore label on a namespace disables sidecar injection", func() {
// Install OSM
installOpts := Td.GetOSMInstallOpts()
installOpts.EnablePermissiveMode = true
Expect(Td.InstallOSM(installOpts)).To(Succeed())

// Create test NS in mesh with ignore label
for _, n := range ns {
Expect(Td.CreateNs(n, map[string]string{constants.IgnoreLabel: "true"})).To(Succeed())
}

// Add monitor-ignore to mesh with sidecar injection disabled
Expect(Td.AddNsToMesh(false, monitorIgnoreNs)).To(Succeed())
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This test case here seems unnecessary given that this test is meant to test the ignore label. Just testing ignore label with sidecar-injection enabled should suffice. This is a k8s functionality that we are testing now and not OSM, so I suggest simplifying this test to only test the ignore label and not all combinations of the matchExpression selector exposed by the k8s API.

// Add sidecar-monitor-ignore to mesh with sidecar injection enabled
Expect(Td.AddNsToMesh(true, sidecarMonitorIgnoreNs)).To(Succeed())

By("Ensuring pod is not injected with a sidecar when added a namespace with the ignore label")

svcAccDef, podDef, svcDef, err := Td.SimplePodApp(
SimplePodAppDef{
Name: "pod1",
Namespace: ignoreNs,
Command: []string{"/bin/bash", "-c", "--"},
Args: []string{"while true; do sleep 30; done;"},
Image: "songrgg/alpine-debug",
Ports: []int{80},
OS: Td.ClusterOS,
})
Expect(err).NotTo(HaveOccurred())

_, err = Td.CreateServiceAccount(ignoreNs, &svcAccDef)
Expect(err).NotTo(HaveOccurred())
pod, err := Td.CreatePod(ignoreNs, podDef)
Expect(err).NotTo(HaveOccurred())
_, err = Td.CreateService(ignoreNs, svcDef)
Expect(err).NotTo(HaveOccurred())

Expect(Td.WaitForPodsRunningReady(ignoreNs, 90*time.Second, 1, nil)).To(Succeed())

pod, err = Td.Client.CoreV1().Pods(ignoreNs).Get(context.Background(), pod.Name, v1.GetOptions{})
Expect(err).NotTo(HaveOccurred())

Expect(hasSidecar(pod.Spec.Containers)).To(BeFalse())

By("Ensuring pod with a sidecar injection label is not injected with a sidecar when added to a namespace with the ignore label")

svcAccDef, podDef, svcDef, err = Td.SimplePodApp(
SimplePodAppDef{
Name: "pod2",
Namespace: ignoreNs,
Command: []string{"/bin/bash", "-c", "--"},
Args: []string{"while true; do sleep 30; done;"},
Image: "songrgg/alpine-debug",
Ports: []int{80},
OS: Td.ClusterOS,
})
Expect(err).NotTo(HaveOccurred())
podDef.Annotations = map[string]string{constants.SidecarInjectionAnnotation: "enabled"}

_, err = Td.CreateServiceAccount(ignoreNs, &svcAccDef)
Expect(err).NotTo(HaveOccurred())
pod, err = Td.CreatePod(ignoreNs, podDef)
Expect(err).NotTo(HaveOccurred())
_, err = Td.CreateService(ignoreNs, svcDef)
Expect(err).NotTo(HaveOccurred())

Expect(Td.WaitForPodsRunningReady(ignoreNs, 90*time.Second, 1, nil)).To(Succeed())

pod, err = Td.Client.CoreV1().Pods(ignoreNs).Get(context.Background(), pod.Name, v1.GetOptions{})
Expect(err).NotTo(HaveOccurred())

Expect(hasSidecar(pod.Spec.Containers)).To(BeFalse())

By("Ensuring a pod is not injected with a sidecar when added to namespace with the monitored-by and ignore labels")

svcAccDef, podDef, svcDef, err = Td.SimplePodApp(
SimplePodAppDef{
Name: "pod1",
Namespace: monitorIgnoreNs,
Command: []string{"/bin/bash", "-c", "--"},
Args: []string{"while true; do sleep 30; done;"},
Image: "songrgg/alpine-debug",
Ports: []int{80},
OS: Td.ClusterOS,
})
Expect(err).NotTo(HaveOccurred())

_, err = Td.CreateServiceAccount(monitorIgnoreNs, &svcAccDef)
Expect(err).NotTo(HaveOccurred())
pod, err = Td.CreatePod(monitorIgnoreNs, podDef)
Expect(err).NotTo(HaveOccurred())
_, err = Td.CreateService(monitorIgnoreNs, svcDef)
Expect(err).NotTo(HaveOccurred())

Expect(Td.WaitForPodsRunningReady(monitorIgnoreNs, 90*time.Second, 1, nil)).To(Succeed())

pod, err = Td.Client.CoreV1().Pods(monitorIgnoreNs).Get(context.Background(), pod.Name, v1.GetOptions{})
Expect(err).NotTo(HaveOccurred())

Expect(hasSidecar(pod.Spec.Containers)).To(BeFalse())

By("Ensuring pod with a sidecar injection label is not injected with a sidecar when added to a namespace with the monitored-by and ignore labels")

svcAccDef, podDef, svcDef, err = Td.SimplePodApp(
SimplePodAppDef{
Name: "pod2",
Namespace: monitorIgnoreNs,
Command: []string{"/bin/bash", "-c", "--"},
Args: []string{"while true; do sleep 30; done;"},
Image: "songrgg/alpine-debug",
Ports: []int{80},
OS: Td.ClusterOS,
})
Expect(err).NotTo(HaveOccurred())
podDef.Annotations = map[string]string{constants.SidecarInjectionAnnotation: "enabled"}

_, err = Td.CreateServiceAccount(monitorIgnoreNs, &svcAccDef)
Expect(err).NotTo(HaveOccurred())
pod, err = Td.CreatePod(monitorIgnoreNs, podDef)
Expect(err).NotTo(HaveOccurred())
_, err = Td.CreateService(monitorIgnoreNs, svcDef)
Expect(err).NotTo(HaveOccurred())

Expect(Td.WaitForPodsRunningReady(monitorIgnoreNs, 90*time.Second, 1, nil)).To(Succeed())

pod, err = Td.Client.CoreV1().Pods(monitorIgnoreNs).Get(context.Background(), pod.Name, v1.GetOptions{})
Expect(err).NotTo(HaveOccurred())

Expect(hasSidecar(pod.Spec.Containers)).To(BeFalse())

By("Ensuring a pod is not injected with a sidecar when added to namespace with the monitored-by, ignore, and sidecar injection labels set")

// Get simple Pod definitions
svcAccDef, podDef, svcDef, err = Td.SimplePodApp(
SimplePodAppDef{
Name: "pod1",
Namespace: sidecarMonitorIgnoreNs,
Command: []string{"/bin/bash", "-c", "--"},
Args: []string{"while true; do sleep 30; done;"},
Image: "songrgg/alpine-debug",
Ports: []int{80},
OS: Td.ClusterOS,
})
Expect(err).NotTo(HaveOccurred())

_, err = Td.CreateServiceAccount(sidecarMonitorIgnoreNs, &svcAccDef)
Expect(err).NotTo(HaveOccurred())
pod, err = Td.CreatePod(sidecarMonitorIgnoreNs, podDef)
Expect(err).NotTo(HaveOccurred())
_, err = Td.CreateService(sidecarMonitorIgnoreNs, svcDef)
Expect(err).NotTo(HaveOccurred())

Expect(Td.WaitForPodsRunningReady(sidecarMonitorIgnoreNs, 90*time.Second, 1, nil)).To(Succeed())

pod, err = Td.Client.CoreV1().Pods(sidecarMonitorIgnoreNs).Get(context.Background(), pod.Name, v1.GetOptions{})
Expect(err).NotTo(HaveOccurred())

Expect(hasSidecar(pod.Spec.Containers)).To(BeFalse())
})
})
})

func hasSidecar(containers []corev1.Container) bool {
for _, container := range containers {
if container.Name == constants.EnvoyContainerName {
return true
}
}
return false
}