Add OperatorCondition status sync and update operator upgradeable check

OperatorCondition controller will update its status to refect the
changes on its spec regarding the operator conditions that are reported
by the operators themselves. In turn, operators can read the status
to confirm if OLM has processed the spec changes.

OLM will not take actions on upgradeable condition if the status is
stale using ObservedGeneration and Generation check.

Upstream-commit: 4ae8df668dd098c204f757b8572fa608a9899bdc
Upstream-repository: operator-lifecycle-manager

Signed-off-by: Vu Dinh <[email protected]>

Author: dinhxuanvu

staging/operator-lifecycle-manager/pkg/controller/operators/olm/operatorconditions.go

@@ -36,6 +36,9 @@ func (a *Operator) isOperatorUpgradeable(csv *v1alpha1.ClusterServiceVersion) (b
 
 	// Check for OperatorUpgradeable condition status
 	if c := meta.FindStatusCondition(cond.Status.Conditions, operatorsv1.Upgradeable); c != nil {
+		if c.ObservedGeneration < cond.ObjectMeta.Generation {
+			return false, fmt.Errorf("The operatorcondition status %q=%q is outdated", c.Type, c.Status)
+		}
 		if c.Status == metav1.ConditionFalse {
 			return false, fmt.Errorf("The operator is not upgradeable: %s", c.Message)
 		}

staging/operator-lifecycle-manager/pkg/controller/operators/operatorcondition_controller.go

@@ -9,6 +9,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	rbacv1 "k8s.io/api/rbac/v1"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
+	meta "k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
@@ -119,6 +120,12 @@ func (r *OperatorConditionReconciler) Reconcile(ctx context.Context, req ctrl.Re
 		return ctrl.Result{Requeue: true}, err
 	}
 
+	err = r.syncOperatorConditionStatus(operatorCondition)
+	if err != nil {
+		log.V(1).Error(err, "Error syncing OperatorCondition Status")
+		return ctrl.Result{Requeue: true}, err
+	}
+
 	return ctrl.Result{}, nil
 }
 
@@ -252,6 +259,26 @@ func (r *OperatorConditionReconciler) ensureDeploymentEnvVars(operatorCondition
 	return nil
 }
 
+func (r *OperatorConditionReconciler) syncOperatorConditionStatus(operatorCondition *operatorsv1.OperatorCondition) error {
+	r.log.V(4).Info("Sync operatorcondition status")
+	currentGen := operatorCondition.ObjectMeta.GetGeneration()
+	changed := false
+	for _, cond := range operatorCondition.Spec.Conditions {
+		if c := meta.FindStatusCondition(operatorCondition.Status.Conditions, cond.Type); c != nil {
+			if cond.Status == c.Status && c.ObservedGeneration == currentGen {
+				continue
+			}
+		}
+		meta.SetStatusCondition(&operatorCondition.Status.Conditions, cond)
+		changed = true
+	}
+
+	if changed {
+		return r.Client.Status().Update(context.TODO(), operatorCondition)
+	}
+	return nil
+}
+
 func ensureEnvVarIsPresent(envVars []corev1.EnvVar, envVar corev1.EnvVar) ([]corev1.EnvVar, bool) {
 	for i, each := range envVars {
 		if each.Name == envVar.Name {