Adds new Status condition "Resolved" and related status field "resolvedBundleResource" to Operator CR

api/v1alpha1/operator_types.go

@@ -46,34 +46,43 @@ type OperatorSpec struct {
 
 const (
 	// TODO(user): add more Types, here and into init()
-	TypeReady = "Ready"
+	TypeReady    = "Ready"
+	TypeResolved = "Resolved"
 
-	ReasonInstallationSucceeded     = "InstallationSucceeded"
-	ReasonResolutionFailed          = "ResolutionFailed"
 	ReasonBundleLookupFailed        = "BundleLookupFailed"
 	ReasonInstallationFailed        = "InstallationFailed"
 	ReasonInstallationStatusUnknown = "InstallationStatusUnknown"
+	ReasonInstallationSucceeded     = "InstallationSucceeded"
 	ReasonInvalidSpec               = "InvalidSpec"
+	ReasonResolutionFailed          = "ResolutionFailed"
+	ReasonResolutionUnknown         = "ResolutionUnknown"
+	ReasonSuccess                   = "Success"
 )
 
 func init() {
 	// TODO(user): add Types from above
 	operatorutil.ConditionTypes = append(operatorutil.ConditionTypes,
 		TypeReady,
+		TypeResolved,
 	)
 	// TODO(user): add Reasons from above
 	operatorutil.ConditionReasons = append(operatorutil.ConditionReasons,
 		ReasonInstallationSucceeded,
 		ReasonResolutionFailed,
+		ReasonResolutionUnknown,
 		ReasonBundleLookupFailed,
 		ReasonInstallationFailed,
 		ReasonInstallationStatusUnknown,
 		ReasonInvalidSpec,
+		ReasonSuccess,
 	)
 }
 
 // OperatorStatus defines the observed state of Operator
 type OperatorStatus struct {
+	// +optional
+	ResolvedBundleResource string `json:"resolvedBundleResource,omitempty"`
+
 	// +patchMergeKey=type
 	// +patchStrategy=merge
 	// +listType=map

config/crd/bases/operators.operatorframework.io_operators.yaml

@@ -131,6 +131,8 @@ spec:
                 x-kubernetes-list-map-keys:
                 - type
                 x-kubernetes-list-type: map
+              resolvedBundleResource:
+                type: string
             type: object
         type: object
     served: true

controllers/operator_controller.go

@@ -113,6 +113,16 @@ func (r *OperatorReconciler) reconcile(ctx context.Context, op *operatorsv1alpha
 			Message:            err.Error(),
 			ObservedGeneration: op.GetGeneration(),
 		})
+		// Set the TypeResolved condition to Unknown to indicate that the resolution
+		// hasn't been attempted yet, due to the spec being invalid.
+		op.Status.ResolvedBundleResource = ""
+		apimeta.SetStatusCondition(&op.Status.Conditions, metav1.Condition{
+			Type:               operatorsv1alpha1.TypeResolved,
+			Status:             metav1.ConditionUnknown,
+			Reason:             operatorsv1alpha1.ReasonResolutionUnknown,
+			Message:            "validation has not been attempted as spec is invalid",
+			ObservedGeneration: op.GetGeneration(),
+		})
 		return ctrl.Result{}, nil
 	}
 	// run resolution
@@ -125,6 +135,14 @@ func (r *OperatorReconciler) reconcile(ctx context.Context, op *operatorsv1alpha
 			Message:            err.Error(),
 			ObservedGeneration: op.GetGeneration(),
 		})
+		op.Status.ResolvedBundleResource = ""
+		apimeta.SetStatusCondition(&op.Status.Conditions, metav1.Condition{
+			Type:               operatorsv1alpha1.TypeResolved,
+			Status:             metav1.ConditionFalse,
+			Reason:             operatorsv1alpha1.ReasonResolutionFailed,
+			Message:            err.Error(),
+			ObservedGeneration: op.GetGeneration(),
+		})
 		return ctrl.Result{}, err
 	}
 
@@ -139,6 +157,14 @@ func (r *OperatorReconciler) reconcile(ctx context.Context, op *operatorsv1alpha
 			Message:            err.Error(),
 			ObservedGeneration: op.GetGeneration(),
 		})
+		op.Status.ResolvedBundleResource = ""
+		apimeta.SetStatusCondition(&op.Status.Conditions, metav1.Condition{
+			Type:               operatorsv1alpha1.TypeResolved,
+			Status:             metav1.ConditionFalse,
+			Reason:             operatorsv1alpha1.ReasonResolutionFailed,
+			Message:            err.Error(),
+			ObservedGeneration: op.GetGeneration(),
+		})
 		return ctrl.Result{}, err
 	}
 
@@ -152,9 +178,27 @@ func (r *OperatorReconciler) reconcile(ctx context.Context, op *operatorsv1alpha
 			Message:            err.Error(),
 			ObservedGeneration: op.GetGeneration(),
 		})
+		op.Status.ResolvedBundleResource = ""
+		apimeta.SetStatusCondition(&op.Status.Conditions, metav1.Condition{
+			Type:               operatorsv1alpha1.TypeResolved,
+			Status:             metav1.ConditionFalse,
+			Reason:             operatorsv1alpha1.ReasonResolutionFailed,
+			Message:            err.Error(),
+			ObservedGeneration: op.GetGeneration(),
+		})
 		return ctrl.Result{}, err
 	}
 
+	// Now we can set the Resolved Condition, and the resolvedBundleSource field to the bundleImage value.
+	op.Status.ResolvedBundleResource = bundleImage
+	apimeta.SetStatusCondition(&op.Status.Conditions, metav1.Condition{
+		Type:               operatorsv1alpha1.TypeResolved,
+		Status:             metav1.ConditionTrue,
+		Reason:             operatorsv1alpha1.ReasonSuccess,
+		Message:            fmt.Sprintf("resolved to %q", bundleImage),
+		ObservedGeneration: op.GetGeneration(),
+	})
+
 	// Ensure a BundleDeployment exists with its bundle source from the bundle
 	// image we just looked up in the solution.
 	dep := r.generateExpectedBundleDeployment(*op, bundleImage)