Remove status.resolution

Fixes #1306

Signed-off-by: Lalatendu Mohanty <lmohanty@redhat.com>

api/v1alpha1/clusterextension_types.go

@@ -470,8 +470,6 @@ type BundleMetadata struct {
 type ClusterExtensionStatus struct {
 	Install *ClusterExtensionInstallStatus `json:"install,omitempty"`
 
-	Resolution *ClusterExtensionResolutionStatus `json:"resolution,omitempty"`
-
 	// conditions is a representation of the current state for this ClusterExtension.
 	// The status is represented by a set of "conditions".
 	//
@@ -512,16 +510,6 @@ type ClusterExtensionInstallStatus struct {
 	Bundle BundleMetadata `json:"bundle"`
 }
 
-type ClusterExtensionResolutionStatus struct {
-	// bundle is a representation of the bundle that was identified during
-	// resolution to meet all installation/upgrade constraints and is slated to be
-	// installed or upgraded to.
-	//
-	// A "bundle" is a versioned set of content that represents the resources that
-	// need to be applied to a cluster to install a package.
-	Bundle BundleMetadata `json:"bundle"`
-}
-
 //+kubebuilder:object:root=true
 //+kubebuilder:resource:scope=Cluster
 //+kubebuilder:subresource:status

config/base/crd/bases/olm.operatorframework.io_clusterextensions.yaml

@@ -572,34 +572,6 @@ spec:
                 required:
                 - bundle
                 type: object
-              resolution:
-                properties:
-                  bundle:
-                    description: |-
-                      bundle is a representation of the bundle that was identified during
-                      resolution to meet all installation/upgrade constraints and is slated to be
-                      installed or upgraded to.
-
-                      A "bundle" is a versioned set of content that represents the resources that
-                      need to be applied to a cluster to install a package.
-                    properties:
-                      name:
-                        description: |-
-                          name is a required field and is a reference
-                          to the name of a bundle
-                        type: string
-                      version:
-                        description: |-
-                          version is a required field and is a reference
-                          to the version that this bundle represents
-                        type: string
-                    required:
-                    - name
-                    - version
-                    type: object
-                required:
-                - bundle
-                type: object
             type: object
         type: object
     served: true

internal/controllers/clusterextension_controller.go

@@ -49,7 +49,6 @@ import (
 	"github.com/operator-framework/operator-registry/alpha/declcfg"
 
 	ocv1alpha1 "github.com/operator-framework/operator-controller/api/v1alpha1"
-	"github.com/operator-framework/operator-controller/internal/bundleutil"
 	"github.com/operator-framework/operator-controller/internal/conditionsets"
 	"github.com/operator-framework/operator-controller/internal/contentmanager"
 	"github.com/operator-framework/operator-controller/internal/labels"
@@ -199,7 +198,6 @@ func (r *ClusterExtensionReconciler) reconcile(ctx context.Context, ext *ocv1alp
 		//  as much status as possible before returning, or at least keeps previous state if
 		//  it is properly labeled with its observed generation.
 		setInstallStatus(ext, nil)
-		setResolutionStatus(ext, nil)
 		setStatusProgressing(ext, err)
 		ensureAllConditionsWithReason(ext, ocv1alpha1.ReasonFailed, err.Error())
 		return ctrl.Result{}, err
@@ -226,7 +224,6 @@ func (r *ClusterExtensionReconciler) reconcile(ctx context.Context, ext *ocv1alp
 	if err != nil {
 		// Note: We don't distinguish between resolution-specific errors and generic errors
 		setInstallStatus(ext, nil)
-		setResolutionStatus(ext, nil)
 		setStatusProgressing(ext, err)
 		ensureAllConditionsWithReason(ext, ocv1alpha1.ReasonFailed, err.Error())
 		return ctrl.Result{}, err
@@ -248,12 +245,6 @@ func (r *ClusterExtensionReconciler) reconcile(ctx context.Context, ext *ocv1alp
 	//         all catalogs?
 	SetDeprecationStatus(ext, resolvedBundle.Name, resolvedDeprecation)
 
-	resolvedBundleMetadata := bundleutil.MetadataFor(resolvedBundle.Name, *resolvedBundleVersion)
-	resStatus := &ocv1alpha1.ClusterExtensionResolutionStatus{
-		Bundle: resolvedBundleMetadata,
-	}
-	setResolutionStatus(ext, resStatus)
-
 	bundleSource := &rukpaksource.BundleSource{
 		Name: ext.GetName(),
 		Type: rukpaksource.SourceTypeImage,

internal/controllers/clusterextension_controller_test.go

@@ -39,61 +39,7 @@ func TestClusterExtensionDoesNotExist(t *testing.T) {
 	require.NoError(t, err)
 }
 
-func TestClusterExtensionResolutionFails(t *testing.T) {
-	pkgName := fmt.Sprintf("non-existent-%s", rand.String(6))
-	cl, reconciler := newClientAndReconciler(t)
-	reconciler.Resolver = resolve.Func(func(_ context.Context, _ *ocv1alpha1.ClusterExtension, _ *ocv1alpha1.BundleMetadata) (*declcfg.Bundle, *bsemver.Version, *declcfg.Deprecation, error) {
-		return nil, nil, nil, fmt.Errorf("no package %q found", pkgName)
-	})
-	ctx := context.Background()
-	extKey := types.NamespacedName{Name: fmt.Sprintf("cluster-extension-test-%s", rand.String(8))}
-
-	t.Log("When the cluster extension specifies a non-existent package")
-	t.Log("By initializing cluster state")
-	clusterExtension := &ocv1alpha1.ClusterExtension{
-		ObjectMeta: metav1.ObjectMeta{Name: extKey.Name},
-		Spec: ocv1alpha1.ClusterExtensionSpec{
-			Source: ocv1alpha1.SourceConfig{
-				SourceType: "Catalog",
-				Catalog: &ocv1alpha1.CatalogSource{
-					PackageName: pkgName,
-				},
-			},
-			Install: ocv1alpha1.ClusterExtensionInstallConfig{
-				Namespace: "default",
-				ServiceAccount: ocv1alpha1.ServiceAccountReference{
-					Name: "default",
-				},
-			},
-		},
-	}
-	require.NoError(t, cl.Create(ctx, clusterExtension))
-
-	t.Log("It sets resolution failure status")
-	t.Log("By running reconcile")
-	res, err := reconciler.Reconcile(ctx, ctrl.Request{NamespacedName: extKey})
-	require.Equal(t, ctrl.Result{}, res)
-	require.EqualError(t, err, fmt.Sprintf("no package %q found", pkgName))
-
-	t.Log("By fetching updated cluster extension after reconcile")
-	require.NoError(t, cl.Get(ctx, extKey, clusterExtension))
-
-	t.Log("By checking the status fields")
-	require.Empty(t, clusterExtension.Status.Resolution)
-	require.Empty(t, clusterExtension.Status.Install)
-
-	t.Log("By checking the expected conditions")
-	cond := apimeta.FindStatusCondition(clusterExtension.Status.Conditions, ocv1alpha1.TypeProgressing)
-	require.NotNil(t, cond)
-	require.Equal(t, metav1.ConditionTrue, cond.Status)
-	require.Equal(t, ocv1alpha1.ReasonRetrying, cond.Reason)
-	require.Equal(t, fmt.Sprintf("no package %q found", pkgName), cond.Message)
-
-	verifyInvariants(ctx, t, reconciler.Client, clusterExtension)
-	require.NoError(t, cl.DeleteAllOf(ctx, &ocv1alpha1.ClusterExtension{}))
-}
-
-func TestClusterExtensionResolutionSuccessfulUnpackFails(t *testing.T) {
+func TestClusterExtensionUnpackFails(t *testing.T) {
 	cl, reconciler := newClientAndReconciler(t)
 	reconciler.Unpacker = &MockUnpacker{
 		err: errors.New("unpack failure"),
@@ -132,7 +78,6 @@ func TestClusterExtensionResolutionSuccessfulUnpackFails(t *testing.T) {
 	err := cl.Create(ctx, clusterExtension)
 	require.NoError(t, err)
 
-	t.Log("It sets resolution success status")
 	t.Log("By running reconcile")
 	reconciler.Resolver = resolve.Func(func(_ context.Context, _ *ocv1alpha1.ClusterExtension, _ *ocv1alpha1.BundleMetadata) (*declcfg.Bundle, *bsemver.Version, *declcfg.Deprecation, error) {
 		v := bsemver.MustParse("1.0.0")
@@ -151,7 +96,6 @@ func TestClusterExtensionResolutionSuccessfulUnpackFails(t *testing.T) {
 
 	t.Log("By checking the status fields")
 	expectedBundleMetadata := ocv1alpha1.BundleMetadata{Name: "prometheus.v1.0.0", Version: "1.0.0"}
-	require.Equal(t, expectedBundleMetadata, clusterExtension.Status.Resolution.Bundle)
 	require.Empty(t, clusterExtension.Status.Install)
 
 	t.Log("By checking the expected conditions")
@@ -205,7 +149,6 @@ func TestClusterExtensionUnpackUnexpectedState(t *testing.T) {
 	err := cl.Create(ctx, clusterExtension)
 	require.NoError(t, err)
 
-	t.Log("It sets resolution success status")
 	t.Log("By running reconcile")
 	reconciler.Resolver = resolve.Func(func(_ context.Context, _ *ocv1alpha1.ClusterExtension, _ *ocv1alpha1.BundleMetadata) (*declcfg.Bundle, *bsemver.Version, *declcfg.Deprecation, error) {
 		v := bsemver.MustParse("1.0.0")
@@ -223,7 +166,7 @@ func TestClusterExtensionUnpackUnexpectedState(t *testing.T) {
 	require.NoError(t, cl.DeleteAllOf(ctx, &ocv1alpha1.ClusterExtension{}))
 }
 
-func TestClusterExtensionResolutionAndUnpackSuccessfulApplierFails(t *testing.T) {
+func TestClusterExtensionUnpackSuccessfulApplierFails(t *testing.T) {
 	cl, reconciler := newClientAndReconciler(t)
 	reconciler.Unpacker = &MockUnpacker{
 		result: &source.Result{
@@ -265,7 +208,6 @@ func TestClusterExtensionResolutionAndUnpackSuccessfulApplierFails(t *testing.T)
 	err := cl.Create(ctx, clusterExtension)
 	require.NoError(t, err)
 
-	t.Log("It sets resolution success status")
 	t.Log("By running reconcile")
 	reconciler.Resolver = resolve.Func(func(_ context.Context, _ *ocv1alpha1.ClusterExtension, _ *ocv1alpha1.BundleMetadata) (*declcfg.Bundle, *bsemver.Version, *declcfg.Deprecation, error) {
 		v := bsemver.MustParse("1.0.0")
@@ -287,7 +229,6 @@ func TestClusterExtensionResolutionAndUnpackSuccessfulApplierFails(t *testing.T)
 
 	t.Log("By checking the status fields")
 	expectedBundleMetadata := ocv1alpha1.BundleMetadata{Name: "prometheus.v1.0.0", Version: "1.0.0"}
-	require.Equal(t, expectedBundleMetadata, clusterExtension.Status.Resolution.Bundle)
 	require.Empty(t, clusterExtension.Status.Install)
 
 	t.Log("By checking the expected installed conditions")
@@ -348,7 +289,6 @@ func TestClusterExtensionManagerFailed(t *testing.T) {
 	err := cl.Create(ctx, clusterExtension)
 	require.NoError(t, err)
 
-	t.Log("It sets resolution success status")
 	t.Log("By running reconcile")
 	reconciler.Resolver = resolve.Func(func(_ context.Context, _ *ocv1alpha1.ClusterExtension, _ *ocv1alpha1.BundleMetadata) (*declcfg.Bundle, *bsemver.Version, *declcfg.Deprecation, error) {
 		v := bsemver.MustParse("1.0.0")
@@ -372,7 +312,6 @@ func TestClusterExtensionManagerFailed(t *testing.T) {
 	require.NoError(t, cl.Get(ctx, extKey, clusterExtension))
 
 	t.Log("By checking the status fields")
-	require.Equal(t, ocv1alpha1.BundleMetadata{Name: "prometheus.v1.0.0", Version: "1.0.0"}, clusterExtension.Status.Resolution.Bundle)
 	require.Equal(t, ocv1alpha1.BundleMetadata{Name: "prometheus.v1.0.0", Version: "1.0.0"}, clusterExtension.Status.Install.Bundle)
 
 	t.Log("By checking the expected installed conditions")
@@ -433,7 +372,6 @@ func TestClusterExtensionManagedContentCacheWatchFail(t *testing.T) {
 	err := cl.Create(ctx, clusterExtension)
 	require.NoError(t, err)
 
-	t.Log("It sets resolution success status")
 	t.Log("By running reconcile")
 	reconciler.Resolver = resolve.Func(func(_ context.Context, _ *ocv1alpha1.ClusterExtension, _ *ocv1alpha1.BundleMetadata) (*declcfg.Bundle, *bsemver.Version, *declcfg.Deprecation, error) {
 		v := bsemver.MustParse("1.0.0")
@@ -459,7 +397,6 @@ func TestClusterExtensionManagedContentCacheWatchFail(t *testing.T) {
 	require.NoError(t, cl.Get(ctx, extKey, clusterExtension))
 
 	t.Log("By checking the status fields")
-	require.Equal(t, ocv1alpha1.BundleMetadata{Name: "prometheus.v1.0.0", Version: "1.0.0"}, clusterExtension.Status.Resolution.Bundle)
 	require.Equal(t, ocv1alpha1.BundleMetadata{Name: "prometheus.v1.0.0", Version: "1.0.0"}, clusterExtension.Status.Install.Bundle)
 
 	t.Log("By checking the expected installed conditions")
@@ -519,7 +456,6 @@ func TestClusterExtensionInstallationSucceeds(t *testing.T) {
 	err := cl.Create(ctx, clusterExtension)
 	require.NoError(t, err)
 
-	t.Log("It sets resolution success status")
 	t.Log("By running reconcile")
 	reconciler.Resolver = resolve.Func(func(_ context.Context, _ *ocv1alpha1.ClusterExtension, _ *ocv1alpha1.BundleMetadata) (*declcfg.Bundle, *bsemver.Version, *declcfg.Deprecation, error) {
 		v := bsemver.MustParse("1.0.0")
@@ -543,7 +479,6 @@ func TestClusterExtensionInstallationSucceeds(t *testing.T) {
 	require.NoError(t, cl.Get(ctx, extKey, clusterExtension))
 
 	t.Log("By checking the status fields")
-	require.Equal(t, ocv1alpha1.BundleMetadata{Name: "prometheus.v1.0.0", Version: "1.0.0"}, clusterExtension.Status.Resolution.Bundle)
 	require.Equal(t, ocv1alpha1.BundleMetadata{Name: "prometheus.v1.0.0", Version: "1.0.0"}, clusterExtension.Status.Install.Bundle)
 
 	t.Log("By checking the expected installed conditions")

internal/controllers/common_controller.go

@@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 
-    http://www.apache.org/licenses/LICENSE-2.0
+	http://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
@@ -48,10 +48,6 @@ func setInstalledStatusConditionFailed(ext *ocv1alpha1.ClusterExtension, message
 	})
 }
 
-func setResolutionStatus(ext *ocv1alpha1.ClusterExtension, resStatus *ocv1alpha1.ClusterExtensionResolutionStatus) {
-	ext.Status.Resolution = resStatus
-}
-
 func setInstallStatus(ext *ocv1alpha1.ClusterExtension, installStatus *ocv1alpha1.ClusterExtensionInstallStatus) {
 	ext.Status.Install = installStatus
 }