If ignore label exist don`t add namespace (#4473)

If ignore label exits don`t add namespace Signed-off-by: mudit singh <[email protected]> Co-authored-by: Shashank Ram <[email protected]>
openservicemesh · Feb 1, 2022 · e350bc0 · e350bc0
1 parent fb5f9df
commit e350bc0
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 4 deletions.
diff --git a/cmd/cli/namespace_add.go b/cmd/cli/namespace_add.go
@@ -15,6 +15,8 @@ import (
 	"github.com/openservicemesh/osm/pkg/constants"
 )
 
+const trueValue = "true"
+
 const namespaceAddDescription = `
 This command adds a namespace or set of namespaces to the mesh so that the osm
 control plane with the given mesh name can observe resources within that namespace
@@ -121,6 +123,11 @@ func (a *namespaceAddCmd) run() error {
 			continue
 		}
 
+		// if ignore label exits don`t add namespace
+		if val, ok := namespace.ObjectMeta.Labels[constants.IgnoreLabel]; ok && val == trueValue {
+			return errors.Errorf("Cannot add ignored namespace")
+		}
+
 		var patch string
 		if a.disableSidecarInjection {
 			// Patch the namespace with monitoring label.

diff --git a/cmd/cli/namespace_test.go b/cmd/cli/namespace_test.go
@@ -16,8 +16,6 @@ import (
 	"github.com/openservicemesh/osm/pkg/constants"
 )
 
-const trueValue = "true"
-
 var (
 	testNamespace     = "namespace"
 	testMeshName      = "mesh"
@@ -62,6 +60,34 @@ var _ = Describe("Running the namespace add command", func() {
 			})
 		})
 
+		Context("adding namespace to the mesh that is ignored", func() {
+
+			BeforeEach(func() {
+				out = new(bytes.Buffer)
+				fakeClientSet = fake.NewSimpleClientset()
+
+				_, err = addDeployment(fakeClientSet, constants.OSMControllerName, testMeshName, "osm-system-namespace", "testVersion0.1.2", true)
+				Expect(err).To(BeNil())
+
+				nsSpec := createNamespaceSpec(testNamespace, "", false, true)
+				_, err = fakeClientSet.CoreV1().Namespaces().Create(context.TODO(), nsSpec, metav1.CreateOptions{})
+				Expect(err).ToNot(HaveOccurred())
+
+				namespaceAddCmd := &namespaceAddCmd{
+					out:        out,
+					meshName:   testMeshName,
+					namespaces: []string{testNamespace},
+					clientSet:  fakeClientSet,
+				}
+
+				err = namespaceAddCmd.run()
+			})
+
+			It("error in adding ignored namespace", func() {
+				Expect(err).To(MatchError("Cannot add ignored namespace"))
+			})
+		})
+
 		Context("adding namespace to the mesh that is already a part of the mesh", func() {
 
 			BeforeEach(func() {

diff --git a/tests/e2e/e2e_ignore_namespace_test.go b/tests/e2e/e2e_ignore_namespace_test.go
@@ -31,8 +31,8 @@ var _ = OSMDescribe("Ignore Namespaces",
 				// Create test NS in mesh with ignore label
 				Expect(Td.CreateNs(ignoreNs, map[string]string{constants.IgnoreLabel: "true"})).To(Succeed())
 
-				// Add test NS to mesh with sidecar injection enabled
-				Expect(Td.AddNsToMesh(true, ignoreNs)).To(Succeed())
+				// Add test NS(with ignore label) to mesh with sidecar injection enabled, it should not succeed
+				Expect(Td.AddNsToMesh(true, ignoreNs)).NotTo(Succeed())
 
 				By("Ensuring a pod is not injected with a sidecar when added to namespace the ignore, and sidecar injection labels set")