Merge pull request #78 from squeed/multus-namespace

Multus: move to "openshift-multus" namespace
openshift · Jan 28, 2019 · 99145e2 · 99145e2
2 parents 8053ff5 + 2fdb353
commit 99145e2
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/bindata/network/multus/000-ns.yaml b/bindata/network/multus/000-ns.yaml
@@ -1,9 +1,9 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: multus
+  name: openshift-multus
   labels:
-    name: multus
+    name: openshift-multus
     openshift.io/run-level: "0"
   annotations:
     openshift.io/node-selector: "" #override default node selector

diff --git a/bindata/network/multus/002-rbac.yaml b/bindata/network/multus/002-rbac.yaml
@@ -48,7 +48,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: multus
-  namespace: multus
+  namespace: openshift-multus
 
 ---
 apiVersion: rbac.authorization.k8s.io/v1
@@ -62,4 +62,4 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: multus
-  namespace: multus
+  namespace: openshift-multus
diff --git a/bindata/network/multus/multus.yaml b/bindata/network/multus/multus.yaml
@@ -2,7 +2,7 @@ kind: DaemonSet
 apiVersion: apps/v1
 metadata:
   name: multus
-  namespace: multus
+  namespace: openshift-multus
   annotations:
     kubernetes.io/description: |
       This daemon set launches the Multus networking component on each node.

diff --git a/pkg/network/multus_test.go b/pkg/network/multus_test.go
@@ -40,23 +40,23 @@ func TestRenderMultus(t *testing.T) {
 	// disable Multus
 	objs, err := RenderMultus(config, manifestDir)
 	g.Expect(err).NotTo(HaveOccurred())
-	g.Expect(objs).NotTo(ContainElement(HaveKubernetesID("DaemonSet", "multus", "multus")))
+	g.Expect(objs).NotTo(ContainElement(HaveKubernetesID("DaemonSet", "openshift-multus", "multus")))
 
 	// enable Multus
 	enabled := false
 	config.DisableMultiNetwork = &enabled
 	objs, err = RenderMultus(config, manifestDir)
 	g.Expect(err).NotTo(HaveOccurred())
-	g.Expect(objs).To(ContainElement(HaveKubernetesID("DaemonSet", "multus", "multus")))
+	g.Expect(objs).To(ContainElement(HaveKubernetesID("DaemonSet", "openshift-multus", "multus")))
 
 	// It's important that the namespace is first
 	g.Expect(len(objs)).To(Equal(6))
 	g.Expect(objs[0]).To(HaveKubernetesID("CustomResourceDefinition", "", "network-attachment-definitions.k8s.cni.cncf.io"))
-	g.Expect(objs).To(ContainElement(HaveKubernetesID("Namespace", "", "multus")))
+	g.Expect(objs).To(ContainElement(HaveKubernetesID("Namespace", "", "openshift-multus")))
 	g.Expect(objs).To(ContainElement(HaveKubernetesID("ClusterRole", "", "multus")))
-	g.Expect(objs).To(ContainElement(HaveKubernetesID("ServiceAccount", "multus", "multus")))
+	g.Expect(objs).To(ContainElement(HaveKubernetesID("ServiceAccount", "openshift-multus", "multus")))
 	g.Expect(objs).To(ContainElement(HaveKubernetesID("ClusterRoleBinding", "", "multus")))
-	g.Expect(objs).To(ContainElement(HaveKubernetesID("DaemonSet", "multus", "multus")))
+	g.Expect(objs).To(ContainElement(HaveKubernetesID("DaemonSet", "openshift-multus", "multus")))
 
 	// Make sure every obj is reasonable:
 	// - it is supported