update ds only if ds changed in last version

Signed-off-by: Michael Shitrit <[email protected]>

controllers/selfnoderemediationconfig_controller.go

@@ -40,7 +40,11 @@ import (
 	"github.com/medik8s/self-node-remediation/pkg/render"
 )
 
-const dsName = "self-node-remediation-ds"
+const (
+	dsName                   = "self-node-remediation-ds"
+	lastChangedAnnotationKey = "dsLastChangeVersion"
+	lastChangeAnnotationVal  = "rhwa-23.3"
+)
 
 // SelfNodeRemediationConfigReconciler reconciles a SelfNodeRemediationConfig object
 type SelfNodeRemediationConfigReconciler struct {
@@ -107,7 +111,7 @@ func (r *SelfNodeRemediationConfigReconciler) syncConfigDaemonSet(ctx context.Co
 	logger := r.Log.WithName("syncConfigDaemonset")
 	logger.Info("Start to sync config daemonset")
 
-	if err := r.removeOldDS(ctx); err != nil {
+	if err := r.removeOldDsOnUpdateOperator(ctx); err != nil {
 		return err
 	}
 
@@ -252,14 +256,19 @@ func (r *SelfNodeRemediationConfigReconciler) convertTolerationsToUnstructed(tol
 	return convertedTolerations, nil
 }
 
-func (r *SelfNodeRemediationConfigReconciler) removeOldDS(ctx context.Context) error {
+func (r *SelfNodeRemediationConfigReconciler) removeOldDsOnUpdateOperator(ctx context.Context) error {
 	ds := &v1.DaemonSet{}
 	key := types.NamespacedName{
 		Namespace: r.Namespace,
 		Name:      dsName,
 	}
 
 	if err := r.Client.Get(ctx, key, ds); err == nil {
+		if lastChangedActualVal, _ := ds.Annotations[lastChangedAnnotationKey]; lastChangedActualVal == lastChangeAnnotationVal {
+			//ds is up-to-date this is not an update scenario
+			return nil
+		}
+
 		if err = r.Client.Delete(ctx, ds); err != nil {
 			r.Log.Error(err, "snr update failed could not delete old daemonset")
 			return pkgerrors.Wrap(err, "unable to delete old daemon set")

install/self-node-remediation-deamonset.yaml

@@ -5,6 +5,8 @@ metadata:
   namespace: {{.Namespace}}
   labels:
     k8s-app: self-node-remediation
+  annotations:
+    dsLastChangeVersion: rhwa-23.3
 spec:
   selector:
     matchLabels: