Fix timestamp logic

rancher · Sep 24, 2020 · 5084b40 · 5084b40
1 parent 0d40969
commit 5084b40
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/modules/agent/pkg/controllers/bundledeployment/controller.go b/modules/agent/pkg/controllers/bundledeployment/controller.go
@@ -112,10 +112,6 @@ func shouldRedeploy(bd *fleet.BundleDeployment) bool {
 	if bd.Status.ForceSync == nil {
 		return true
 	}
-	if bd.Spec.Options.ForceSyncBefore.Time.After(time.Now().Add(-15 * time.Minute)) {
-		return false
-	}
-
 	return bd.Status.ForceSync.Before(bd.Spec.Options.ForceSyncBefore)
 }
 

diff --git a/pkg/controllers/cluster/import.go b/pkg/controllers/cluster/import.go
@@ -60,9 +60,10 @@ func agentDeployed(cluster *fleet.Cluster) bool {
 	if cluster.Status.AgentLastDeployed == nil {
 		return false
 	}
-	return cluster.Spec.ForceUpdateAgent == nil ||
-		cluster.Spec.ForceUpdateAgent.Time.After(time.Now().Add(-15*time.Minute)) ||
-		cluster.Spec.ForceUpdateAgent.Before(cluster.Status.AgentLastDeployed)
+	if cluster.Spec.ForceUpdateAgent == nil {
+		return true
+	}
+	return !cluster.Status.AgentLastDeployed.Before(cluster.Spec.ForceUpdateAgent)
 }
 
 func (i *importHandler) OnChange(key string, cluster *fleet.Cluster) (_ *fleet.Cluster, err error) {
@@ -173,7 +174,11 @@ func (i *importHandler) importCluster(cluster *fleet.Cluster, status fleet.Clust
 		return status, err
 	}
 
-	now := metav1.Now()
-	status.AgentLastDeployed = &now
+	if cluster.Spec.ForceUpdateAgent != nil {
+		status.AgentLastDeployed = cluster.Spec.ForceUpdateAgent
+	} else {
+		now := metav1.Now()
+		status.AgentLastDeployed = &now
+	}
 	return status, nil
 }