From 2f518585331fead39bd8c481d4af9dabb5185fc9 Mon Sep 17 00:00:00 2001
From: Nimrod Gilboa Markevich <nimrod@up9.com>
Date: Mon, 14 Feb 2022 19:15:49 +0200
Subject: [PATCH] Revert "Force DaemonSet apply"

This reverts commit affbb4f27cec63cc33529a980eaffcf1b814edc9.
---
 shared/kubernetes/provider.go | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/shared/kubernetes/provider.go b/shared/kubernetes/provider.go
index bd11367bf..fbb74df05 100644
--- a/shared/kubernetes/provider.go
+++ b/shared/kubernetes/provider.go
@@ -952,11 +952,6 @@ func (provider *Provider) ApplyMizuTapperDaemonSet(ctx context.Context, namespac
 	labelSelector := applyconfmeta.LabelSelector()
 	labelSelector.WithMatchLabels(map[string]string{"app": tapperPodName})
 
-	applyOptions := metav1.ApplyOptions{
-		Force: true,
-		FieldManager: fieldManagerName,
-	}
-
 	daemonSet := applyconfapp.DaemonSet(daemonSetName, namespace)
 	daemonSet.
 		WithLabels(map[string]string{
@@ -965,7 +960,7 @@ func (provider *Provider) ApplyMizuTapperDaemonSet(ctx context.Context, namespac
 		}).
 		WithSpec(applyconfapp.DaemonSetSpec().WithSelector(labelSelector).WithTemplate(podTemplate))
 
-	_, err = provider.clientSet.AppsV1().DaemonSets(namespace).Apply(ctx, daemonSet, applyOptions)
+	_, err = provider.clientSet.AppsV1().DaemonSets(namespace).Apply(ctx, daemonSet, metav1.ApplyOptions{FieldManager: fieldManagerName})
 	return err
 }