Merge pull request #1514 from dougbtv/multus-admission-deployment

The Multus admission controller should run as a deployment
openshift · Jul 20, 2022 · 2212a26 · 2212a26
2 parents 21bbc82 + ee50297
commit 2212a26
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/bindata/network/multus-admission-controller/admission-controller.yaml b/bindata/network/multus-admission-controller/admission-controller.yaml
@@ -1,5 +1,5 @@
 ---
-kind: DaemonSet
+kind: Deployment
 apiVersion: apps/v1
 metadata:
   name: multus-admission-controller
@@ -8,16 +8,15 @@ metadata:
     app: multus-admission-controller
   annotations:
     kubernetes.io/description: |
-      This daemon set launches the Multus admisson controller component on each node.
+      This deployment launches the Multus admisson controller component.
     release.openshift.io/version: "{{.ReleaseVersion}}"
     networkoperator.openshift.io/non-critical: ""
 spec:
+  replicas: 2
   selector:
     matchLabels:
       app: multus-admission-controller
       namespace: openshift-multus
-  updateStrategy:
-    type: RollingUpdate
   template:
     metadata:
       annotations:

diff --git a/pkg/network/multus_admission_controller_test.go b/pkg/network/multus_admission_controller_test.go
@@ -39,20 +39,20 @@ func TestRenderMultusAdmissionController(t *testing.T) {
 	// disable MultusAdmissionController
 	objs, err := renderMultusAdmissionController(config, manifestDir, false)
 	g.Expect(err).NotTo(HaveOccurred())
-	g.Expect(objs).NotTo(ContainElement(HaveKubernetesID("DaemonSet", "openshift-multus", "multus-admission-controller")))
+	g.Expect(objs).NotTo(ContainElement(HaveKubernetesID("Deployment", "openshift-multus", "multus-admission-controller")))
 
 	// enable MultusAdmissionController
 	enabled := false
 	config.DisableMultiNetwork = &enabled
 	objs, err = renderMultusAdmissionController(config, manifestDir, false)
 	g.Expect(err).NotTo(HaveOccurred())
-	g.Expect(objs).To(ContainElement(HaveKubernetesID("DaemonSet", "openshift-multus", "multus-admission-controller")))
+	g.Expect(objs).To(ContainElement(HaveKubernetesID("Deployment", "openshift-multus", "multus-admission-controller")))
 
 	// Check rendered object
 	g.Expect(len(objs)).To(Equal(9))
 	g.Expect(objs).To(ContainElement(HaveKubernetesID("Service", "openshift-multus", "multus-admission-controller")))
 	g.Expect(objs).To(ContainElement(HaveKubernetesID("ClusterRole", "", "multus-admission-controller-webhook")))
 	g.Expect(objs).To(ContainElement(HaveKubernetesID("ClusterRoleBinding", "", "multus-admission-controller-webhook")))
 	g.Expect(objs).To(ContainElement(HaveKubernetesID("ValidatingWebhookConfiguration", "", names.MULTUS_VALIDATING_WEBHOOK)))
-	g.Expect(objs).To(ContainElement(HaveKubernetesID("DaemonSet", "openshift-multus", "multus-admission-controller")))
+	g.Expect(objs).To(ContainElement(HaveKubernetesID("Deployment", "openshift-multus", "multus-admission-controller")))
 }