Merge pull request #365 from stlaz/updatespam

Bug 1891758: deployment: update event spam
openshift · Oct 27, 2020 · cc9d50e · cc9d50e
2 parents 82e8f18 + 759e5d3
commit cc9d50e
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/pkg/controllers/deployment/deployment_controller.go b/pkg/controllers/deployment/deployment_controller.go
@@ -360,7 +360,9 @@ func (c *deploymentController) updateOperatorDeploymentInfo(
 	operatorConfig *operatorv1.Authentication,
 	deployment *appsv1.Deployment,
 ) error {
-	operatorStatusOutdated := operatorConfig.Status.ObservedGeneration != operatorConfig.Generation || operatorConfig.Status.ReadyReplicas != deployment.Status.UpdatedReplicas
+	operatorStatusOutdated := operatorConfig.Status.ObservedGeneration != operatorConfig.Generation ||
+		operatorConfig.Status.ReadyReplicas != deployment.Status.UpdatedReplicas ||
+		resourcemerge.ExpectedDeploymentGeneration(deployment, operatorConfig.Status.Generations) != deployment.Generation
 
 	if operatorStatusOutdated {
 		if err := retry.RetryOnConflict(retry.DefaultRetry, func() error {