propagate conditions from CER to cluster extension

* added `.status.activeRevisions` for tracking
* `Progressing` is mirrored from the counterpart of the latest revision
* `Available` is mirrored from the counterpart of the latest installed revision
* If the latest revision is rolled out, but not yet available, its `Available` condition is mirrored under its `activeRevision` entry.

Author: pedjak

api/v1/clusterextension_types.go

@@ -469,6 +469,14 @@ type BundleMetadata struct {
 	Version string `json:"version"`
 }
 
+type RevisionStatus struct {
+	Name string `json:"name"`
+	// +listType=map
+	// +listMapKey=type
+	// +optional
+	Conditions []metav1.Condition `json:"conditions,omitempty"`
+}
+
 // ClusterExtensionStatus defines the observed state of a ClusterExtension.
 type ClusterExtensionStatus struct {
 	// The set of condition types which apply to all spec.source variations are Installed and Progressing.
@@ -498,6 +506,12 @@ type ClusterExtensionStatus struct {
 	//
 	// +optional
 	Install *ClusterExtensionInstallStatus `json:"install,omitempty"`
+
+	// +listType=map
+	// +listMapKey=name
+	// +optional
+	// <opcon:experimental>
+	ActiveRevisions []RevisionStatus `json:"activeRevisions,omitempty"`
 }
 
 // ClusterExtensionInstallStatus is a representation of the status of the identified bundle.
@@ -516,7 +530,7 @@ type ClusterExtensionInstallStatus struct {
 // +kubebuilder:subresource:status
 // +kubebuilder:printcolumn:name="Installed Bundle",type=string,JSONPath=`.status.install.bundle.name`
 // +kubebuilder:printcolumn:name=Version,type=string,JSONPath=`.status.install.bundle.version`
-// +kubebuilder:printcolumn:name="Installed",type=string,JSONPath=`.status.conditions[?(@.type=='Installed')].status`
+// +kubebuilder:printcolumn:name="Available",type=string,JSONPath=`.status.conditions[?(@.type=='Available')].status`
 // +kubebuilder:printcolumn:name="Progressing",type=string,JSONPath=`.status.conditions[?(@.type=='Progressing')].status`
 // +kubebuilder:printcolumn:name=Age,type=date,JSONPath=`.metadata.creationTimestamp`
 

api/v1/zz_generated.deepcopy.go

@@ -22,8 +22,8 @@ spec:
     - jsonPath: .status.install.bundle.version
       name: Version
       type: string
-    - jsonPath: .status.conditions[?(@.type=='Installed')].status
-      name: Installed
+    - jsonPath: .status.conditions[?(@.type=='Available')].status
+      name: Available
       type: string
     - jsonPath: .status.conditions[?(@.type=='Progressing')].status
       name: Progressing
@@ -505,6 +505,78 @@ spec:
             description: status is an optional field that defines the observed state
               of the ClusterExtension.
             properties:
+              activeRevisions:
+                items:
+                  properties:
+                    conditions:
+                      items:
+                        description: Condition contains details for one aspect of
+                          the current state of this API Resource.
+                        properties:
+                          lastTransitionTime:
+                            description: |-
+                              lastTransitionTime is the last time the condition transitioned from one status to another.
+                              This should be when the underlying condition changed.  If that is not known, then using the time when the API field changed is acceptable.
+                            format: date-time
+                            type: string
+                          message:
+                            description: |-
+                              message is a human readable message indicating details about the transition.
+                              This may be an empty string.
+                            maxLength: 32768
+                            type: string
+                          observedGeneration:
+                            description: |-
+                              observedGeneration represents the .metadata.generation that the condition was set based upon.
+                              For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
+                              with respect to the current state of the instance.
+                            format: int64
+                            minimum: 0
+                            type: integer
+                          reason:
+                            description: |-
+                              reason contains a programmatic identifier indicating the reason for the condition's last transition.
+                              Producers of specific condition types may define expected values and meanings for this field,
+                              and whether the values are considered a guaranteed API.
+                              The value should be a CamelCase string.
+                              This field may not be empty.
+                            maxLength: 1024
+                            minLength: 1
+                            pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
+                            type: string
+                          status:
+                            description: status of the condition, one of True, False,
+                              Unknown.
+                            enum:
+                            - "True"
+                            - "False"
+                            - Unknown
+                            type: string
+                          type:
+                            description: type of condition in CamelCase or in foo.example.com/CamelCase.
+                            maxLength: 316
+                            pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
+                            type: string
+                        required:
+                        - lastTransitionTime
+                        - message
+                        - reason
+                        - status
+                        - type
+                        type: object
+                      type: array
+                      x-kubernetes-list-map-keys:
+                      - type
+                      x-kubernetes-list-type: map
+                    name:
+                      type: string
+                  required:
+                  - name
+                  type: object
+                type: array
+                x-kubernetes-list-map-keys:
+                - name
+                x-kubernetes-list-type: map
               conditions:
                 description: |-
                   The set of condition types which apply to all spec.source variations are Installed and Progressing.

helm/olmv1/base/operator-controller/crd/experimental/olm.operatorframework.io_clusterextensions.yaml

@@ -22,8 +22,8 @@ spec:
     - jsonPath: .status.install.bundle.version
       name: Version
       type: string
-    - jsonPath: .status.conditions[?(@.type=='Installed')].status
-      name: Installed
+    - jsonPath: .status.conditions[?(@.type=='Available')].status
+      name: Available
       type: string
     - jsonPath: .status.conditions[?(@.type=='Progressing')].status
       name: Progressing

helm/olmv1/base/operator-controller/crd/standard/olm.operatorframework.io_clusterextensions.yaml

@@ -317,8 +317,6 @@ func (bc *Boxcutter) apply(ctx context.Context, contentFS fs.FS, ext *ocv1.Clust
 		return false, "New revision created", nil
 	} else if progressingCondition != nil && progressingCondition.Status == metav1.ConditionTrue {
 		return false, progressingCondition.Message, nil
-	} else if availableCondition != nil && availableCondition.Status != metav1.ConditionTrue {
-		return false, "", errors.New(availableCondition.Message)
 	} else if succeededCondition != nil && succeededCondition.Status != metav1.ConditionTrue {
 		return false, succeededCondition.Message, nil
 	}

internal/operator-controller/applier/boxcutter.go

@@ -297,32 +297,43 @@ func (r *ClusterExtensionReconciler) reconcile(ctx context.Context, ext *ocv1.Cl
 	// to ensure exponential backoff can occur:
 	//   - Permission errors (it is not possible to watch changes to permissions.
 	//     The only way to eventually recover from permission errors is to keep retrying).
-	rolloutSucceeded, rolloutStatus, err := r.Applier.Apply(ctx, imageFS, ext, objLbls, storeLbls)
-
-	// Set installed status
-	if rolloutSucceeded {
-		revisionStates = &RevisionStates{Installed: resolvedRevisionMetadata}
-	} else if err == nil && revisionStates.Installed == nil && len(revisionStates.RollingOut) == 0 {
-		revisionStates = &RevisionStates{RollingOut: []*RevisionMetadata{resolvedRevisionMetadata}}
-	}
-	setInstalledStatusFromRevisionStates(ext, revisionStates)
-
-	// If there was an error applying the resolved bundle,
-	// report the error via the Progressing condition.
-	if err != nil {
+	if _, _, err := r.Applier.Apply(ctx, imageFS, ext, objLbls, storeLbls); err != nil {
+		// If there was an error applying the resolved bundle,
+		// report the error via the Progressing condition.
 		setStatusProgressing(ext, wrapErrorWithResolutionInfo(resolvedRevisionMetadata.BundleMetadata, err))
 		return ctrl.Result{}, err
-	} else if !rolloutSucceeded {
-		apimeta.SetStatusCondition(&ext.Status.Conditions, metav1.Condition{
-			Type:               ocv1.TypeProgressing,
-			Status:             metav1.ConditionTrue,
-			Reason:             ocv1.ReasonRolloutInProgress,
-			Message:            rolloutStatus,
-			ObservedGeneration: ext.GetGeneration(),
-		})
-	} else {
-		setStatusProgressing(ext, nil)
 	}
+
+	// Mirror Available/Progressing conditions from the installed revision
+	if i := revisionStates.Installed; i != nil {
+		for _, cndType := range []string{ocv1.ClusterExtensionRevisionTypeAvailable, ocv1.ClusterExtensionRevisionTypeProgressing} {
+			cnd := *apimeta.FindStatusCondition(i.Conditions, cndType)
+			apimeta.SetStatusCondition(&ext.Status.Conditions, cnd)
+		}
+		ext.Status.Install = &ocv1.ClusterExtensionInstallStatus{
+			Bundle: i.BundleMetadata,
+		}
+		ext.Status.ActiveRevisions = []ocv1.RevisionStatus{{Name: i.RevName}}
+	}
+	for idx, r := range revisionStates.RollingOut {
+		rs := ocv1.RevisionStatus{Name: r.RevName}
+		// Mirror Progressing condition from the latest active revision
+		if idx == len(revisionStates.RollingOut)-1 {
+			pcnd := apimeta.FindStatusCondition(r.Conditions, ocv1.ClusterExtensionRevisionTypeProgressing)
+			if pcnd != nil {
+				apimeta.SetStatusCondition(&ext.Status.Conditions, *pcnd)
+			}
+			if acnd := apimeta.FindStatusCondition(r.Conditions, ocv1.ClusterExtensionRevisionTypeAvailable); pcnd.Status == metav1.ConditionFalse && acnd != nil && acnd.Status != metav1.ConditionTrue {
+				apimeta.SetStatusCondition(&rs.Conditions, *acnd)
+			}
+		}
+		if len(ext.Status.ActiveRevisions) == 0 {
+			ext.Status.ActiveRevisions = []ocv1.RevisionStatus{rs}
+		} else {
+			ext.Status.ActiveRevisions = append(ext.Status.ActiveRevisions, rs)
+		}
+	}
+
 	return ctrl.Result{}, nil
 }
 
@@ -474,9 +485,11 @@ func clusterExtensionRequestsForCatalog(c client.Reader, logger logr.Logger) crh
 }
 
 type RevisionMetadata struct {
+	RevName string
 	Package string
 	Image   string
 	ocv1.BundleMetadata
+	Conditions []metav1.Condition
 }
 
 type RevisionStates struct {
@@ -553,8 +566,10 @@ func (d *BoxcutterRevisionStatesGetter) GetRevisionStates(ctx context.Context, e
 		//   is fairly decoupled from this code where we get the annotations back out. We may want to co-locate
 		//   the set/get logic a bit better to make it more maintainable and less likely to get out of sync.
 		rm := &RevisionMetadata{
-			Package: rev.Labels[labels.PackageNameKey],
-			Image:   rev.Annotations[labels.BundleReferenceKey],
+			RevName:    rev.Name,
+			Package:    rev.Labels[labels.PackageNameKey],
+			Image:      rev.Annotations[labels.BundleReferenceKey],
+			Conditions: rev.Status.Conditions,
 			BundleMetadata: ocv1.BundleMetadata{
 				Name:    rev.Annotations[labels.BundleNameKey],
 				Version: rev.Annotations[labels.BundleVersionKey],

internal/operator-controller/controllers/clusterextension_controller.go

@@ -10,6 +10,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/operator-framework/operator-controller/internal/operator-controller/labels"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
@@ -122,6 +123,7 @@ func (c *ClusterExtensionRevisionReconciler) reconcile(ctx context.Context, rev
 		return c.teardown(ctx, rev, revision)
 	}
 
+	revVersion := rev.GetAnnotations()[labels.BundleVersionKey]
 	//
 	// Reconcile
 	//
@@ -138,7 +140,7 @@ func (c *ClusterExtensionRevisionReconciler) reconcile(ctx context.Context, rev
 			rev.MarkAsProgressing(ocv1.ClusterExtensionRevisionReasonReconcileFailure, werr.Error())
 			return ctrl.Result{}, werr
 		}
-		rev.MarkAsProgressing(ocv1.ClusterExtensionRevisionReasonRolloutInProgress, "Revision is being rolled out.")
+		rev.MarkAsProgressing(ocv1.ClusterExtensionRevisionReasonRolloutInProgress, fmt.Sprintf("Revision %s is being rolled out.", revVersion))
 	}
 
 	rres, err := c.RevisionEngine.Reconcile(ctx, *revision, opts...)
@@ -225,7 +227,7 @@ func (c *ClusterExtensionRevisionReconciler) reconcile(ctx context.Context, rev
 
 	if !rres.InTransistion() {
 		// we have rolled out all objects in all phases, not interested in probes here
-		rev.MarkAsNotProgressing(ocv1.ClusterExtensionRevisionReasonRolledOut, "Revision is rolled out.")
+		rev.MarkAsNotProgressing(ocv1.ClusterExtensionRevisionReasonRolledOut, fmt.Sprintf("Revision %s is rolled out.", revVersion))
 	}
 
 	//nolint:nestif
@@ -284,7 +286,7 @@ func (c *ClusterExtensionRevisionReconciler) reconcile(ctx context.Context, rev
 		if len(probeFailureMsgs) > 0 {
 			rev.MarkAsUnavailable(ocv1.ClusterExtensionRevisionReasonProbeFailure, strings.Join(probeFailureMsgs, "\n"))
 		} else {
-			rev.MarkAsUnavailable(ocv1.ClusterExtensionRevisionReasonIncomplete, "Revision has not been rolled out completely.")
+			rev.MarkAsUnavailable(ocv1.ClusterExtensionRevisionReasonIncomplete, fmt.Sprintf("Revision %s has not been rolled out completely.", revVersion))
 		}
 	}