Merge pull request #2049 from tmaxjmc/master

🐛fix: add more condition for resource's status filtering
kubernetes-sigs · Oct 21, 2020 · 16515f7 · 16515f7
2 parents 98cc901 + 961b49f
commit 16515f7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/controllers/awscluster_controller.go b/controllers/awscluster_controller.go
@@ -248,6 +248,9 @@ func (r *AWSClusterReconciler) SetupWithManager(mgr ctrl.Manager, options contro
 					oldCluster.Status = infrav1.AWSClusterStatus{}
 					newCluster.Status = infrav1.AWSClusterStatus{}
 
+					oldCluster.ObjectMeta.ResourceVersion = ""
+					newCluster.ObjectMeta.ResourceVersion = ""
+
 					return !reflect.DeepEqual(oldCluster, newCluster)
 				},
 			},

diff --git a/controllers/awsmachine_controller.go b/controllers/awsmachine_controller.go
@@ -224,6 +224,9 @@ func (r *AWSMachineReconciler) SetupWithManager(mgr ctrl.Manager, options contro
 					oldMachine.Status = infrav1.AWSMachineStatus{}
 					newMachine.Status = infrav1.AWSMachineStatus{}
 
+					oldMachine.ObjectMeta.ResourceVersion = ""
+					newMachine.ObjectMeta.ResourceVersion = ""
+
 					return !reflect.DeepEqual(oldMachine, newMachine)
 				},
 			},