NETOBSERV-1134: do not unregister plugin (#507)

Plugin might be registered by different means; we shouldn't reconcile registration based on the register field when it's false, as it would override any other mean to register it.
netobserv · Jan 8, 2024 · 2326a5f · 2326a5f
1 parent d1e9c04
commit 2326a5f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/controllers/consoleplugin/consoleplugin_reconciler.go b/controllers/consoleplugin/consoleplugin_reconciler.go
@@ -131,9 +131,6 @@ func (r *CPReconciler) checkAutoPatch(ctx context.Context, desired *flowslatest.
 	if reg && !registered {
 		console.Spec.Plugins = append(console.Spec.Plugins, constants.PluginName)
 		return r.Client.Update(ctx, &console)
-	} else if !reg && registered {
-		console.Spec.Plugins = helper.RemoveAllStrings(console.Spec.Plugins, constants.PluginName)
-		return r.Client.Update(ctx, &console)
 	}
 	return nil
 }

diff --git a/controllers/flowcollector_controller_console_test.go b/controllers/flowcollector_controller_console_test.go
@@ -77,7 +77,7 @@ func flowCollectorConsolePluginSpecs() {
 						Enable:          ptr.To(true),
 						Port:            9001,
 						ImagePullPolicy: "Never",
-						Register:        ptr.To(true),
+						Register:        ptr.To(false),
 						Autoscaler: flowslatest.FlowCollectorHPA{
 							Status:      flowslatest.HPAStatusEnabled,
 							MinReplicas: ptr.To(int32(1)),
@@ -224,20 +224,20 @@ func flowCollectorConsolePluginSpecs() {
 	})
 
 	Context("Registering to the Console CR", func() {
-		It("Should be registered by default", func() {
+		It("Should start unregistered", func() {
 			Eventually(func() interface{} {
 				cr := operatorsv1.Console{}
 				if err := k8sClient.Get(ctx, consoleCRKey, &cr); err != nil {
 					return err
 				}
 				return cr.Spec.Plugins
-			}, timeout, interval).Should(Equal([]string{"netobserv-plugin"}))
+			}, timeout, interval).Should(BeEmpty())
 		})
 
 		It("Should be unregistered", func() {
 			By("Update CR to unregister")
 			updateCR(crKey, func(fc *flowslatest.FlowCollector) {
-				fc.Spec.ConsolePlugin.Register = ptr.To(false)
+				fc.Spec.ConsolePlugin.Register = ptr.To(true)
 			})
 
 			By("Expecting the Console CR to not have plugin registered")
@@ -247,7 +247,7 @@ func flowCollectorConsolePluginSpecs() {
 					return err
 				}
 				return cr.Spec.Plugins
-			}, timeout, interval).Should(BeEmpty())
+			}, timeout, interval).Should(Equal([]string{"netobserv-plugin"}))
 		})
 	})