Merge pull request #62 from mrogers950/reconcile

Check for an operator config change before updating
openshift · Jan 18, 2019 · 84f0c33 · 84f0c33
2 parents 726b188 + 5e79016
commit 84f0c33
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/pkg/operator/operator.go b/pkg/operator/operator.go
@@ -6,6 +6,7 @@ import (
 
 	"github.com/blang/semver"
 
+	apiequality "k8s.io/apimachinery/pkg/api/equality"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	utilerrors "k8s.io/apimachinery/pkg/util/errors"
@@ -114,6 +115,8 @@ func (c serviceCertSignerOperator) Sync(obj metav1.Object) error {
 		return nil
 	}
 
+	operatorConfigOriginal := operatorConfig.DeepCopy()
+
 	var currentActualVerion *semver.Version
 
 	if operatorConfig.Status.CurrentAvailability != nil {
@@ -183,8 +186,10 @@ func (c serviceCertSignerOperator) Sync(obj metav1.Object) error {
 		operatorConfig.Status.ObservedGeneration = operatorConfig.ObjectMeta.Generation
 	}
 
-	if _, err := c.operatorConfigClient.ServiceCertSignerOperatorConfigs().UpdateStatus(operatorConfig); err != nil {
-		errors = append(errors, err)
+	if !apiequality.Semantic.DeepEqual(operatorConfigOriginal, operatorConfig) {
+		if _, err := c.operatorConfigClient.ServiceCertSignerOperatorConfigs().UpdateStatus(operatorConfig); err != nil {
+			errors = append(errors, err)
+		}
 	}
 
 	return utilerrors.NewAggregate(errors)