Update operator-controller for catalogd condition changes

Signed-off-by: Per Goncalves da Silva <[email protected]>

Author: Per Goncalves da Silva

internal/catalogmetadata/client/client.go

@@ -39,8 +39,8 @@ type Client struct {
 func (c *Client) GetPackage(ctx context.Context, catalog *catalogd.ClusterCatalog, pkgName string) (*declcfg.DeclarativeConfig, error) {
 	// if the catalog has not been successfully unpacked, report an error. This ensures that our
 	// reconciles are deterministic and wait for all desired catalogs to be ready.
-	if !meta.IsStatusConditionPresentAndEqual(catalog.Status.Conditions, catalogd.TypeUnpacked, metav1.ConditionTrue) {
-		return nil, fmt.Errorf("catalog %q is not unpacked", catalog.Name)
+	if !meta.IsStatusConditionPresentAndEqual(catalog.Status.Conditions, catalogd.TypeServing, metav1.ConditionTrue) {
+		return nil, fmt.Errorf("catalog %q is not yet being served", catalog.Name)
 	}
 
 	catalogFsys, err := c.fetcher.FetchCatalogContents(ctx, catalog)

internal/catalogmetadata/client/client_test.go

@@ -34,13 +34,13 @@ func TestClientNew(t *testing.T) {
 			catalog: &catalogd.ClusterCatalog{ObjectMeta: metav1.ObjectMeta{Name: "catalog-1"}},
 			fetcher: fetcherFunc(func(context.Context, *catalogd.ClusterCatalog) (fs.FS, error) { return testFS, nil }),
 			assert: func(t *testing.T, dc *declcfg.DeclarativeConfig, err error) {
-				assert.ErrorContains(t, err, `catalog "catalog-1" is not unpacked`)
+				assert.ErrorContains(t, err, `catalog "catalog-1" is not yet being served`)
 			},
 		},
 		{
 			name: "unpacked, fetcher returns error",
 			catalog: &catalogd.ClusterCatalog{
-				Status: catalogd.ClusterCatalogStatus{Conditions: []metav1.Condition{{Type: catalogd.TypeUnpacked, Status: metav1.ConditionTrue}}},
+				Status: catalogd.ClusterCatalogStatus{Conditions: []metav1.Condition{{Type: catalogd.TypeServing, Status: metav1.ConditionTrue}}},
 			},
 			fetcher: fetcherFunc(func(context.Context, *catalogd.ClusterCatalog) (fs.FS, error) { return nil, errors.New("fetch error") }),
 			assert: func(t *testing.T, dc *declcfg.DeclarativeConfig, err error) {
@@ -50,7 +50,7 @@ func TestClientNew(t *testing.T) {
 		{
 			name: "unpacked, invalid package path",
 			catalog: &catalogd.ClusterCatalog{
-				Status: catalogd.ClusterCatalogStatus{Conditions: []metav1.Condition{{Type: catalogd.TypeUnpacked, Status: metav1.ConditionTrue}}},
+				Status: catalogd.ClusterCatalogStatus{Conditions: []metav1.Condition{{Type: catalogd.TypeServing, Status: metav1.ConditionTrue}}},
 			},
 			fetcher: fetcherFunc(func(context.Context, *catalogd.ClusterCatalog) (fs.FS, error) { return testFS, nil }),
 			pkgName: "/",
@@ -61,7 +61,7 @@ func TestClientNew(t *testing.T) {
 		{
 			name: "unpacked, package missing",
 			catalog: &catalogd.ClusterCatalog{
-				Status: catalogd.ClusterCatalogStatus{Conditions: []metav1.Condition{{Type: catalogd.TypeUnpacked, Status: metav1.ConditionTrue}}},
+				Status: catalogd.ClusterCatalogStatus{Conditions: []metav1.Condition{{Type: catalogd.TypeServing, Status: metav1.ConditionTrue}}},
 			},
 			pkgName: "pkg-missing",
 			fetcher: fetcherFunc(func(context.Context, *catalogd.ClusterCatalog) (fs.FS, error) { return testFS, nil }),
@@ -73,7 +73,7 @@ func TestClientNew(t *testing.T) {
 		{
 			name: "unpacked, invalid package present",
 			catalog: &catalogd.ClusterCatalog{
-				Status: catalogd.ClusterCatalogStatus{Conditions: []metav1.Condition{{Type: catalogd.TypeUnpacked, Status: metav1.ConditionTrue}}},
+				Status: catalogd.ClusterCatalogStatus{Conditions: []metav1.Condition{{Type: catalogd.TypeServing, Status: metav1.ConditionTrue}}},
 			},
 			pkgName: "invalid-pkg-present",
 			fetcher: fetcherFunc(func(context.Context, *catalogd.ClusterCatalog) (fs.FS, error) {
@@ -89,7 +89,7 @@ func TestClientNew(t *testing.T) {
 		{
 			name: "unpacked, package present",
 			catalog: &catalogd.ClusterCatalog{
-				Status: catalogd.ClusterCatalogStatus{Conditions: []metav1.Condition{{Type: catalogd.TypeUnpacked, Status: metav1.ConditionTrue}}},
+				Status: catalogd.ClusterCatalogStatus{Conditions: []metav1.Condition{{Type: catalogd.TypeServing, Status: metav1.ConditionTrue}}},
 			},
 			pkgName: "pkg-present",
 			fetcher: fetcherFunc(func(context.Context, *catalogd.ClusterCatalog) (fs.FS, error) { return testFS, nil }),

test/e2e/cluster_extension_install_test.go

@@ -614,12 +614,12 @@ func TestClusterExtensionInstallReResolvesWhenCatalogIsPatched(t *testing.T) {
 	require.NoError(t, err)
 	require.EventuallyWithT(t, func(ct *assert.CollectT) {
 		assert.NoError(ct, c.Get(context.Background(), types.NamespacedName{Name: extensionCatalog.Name}, extensionCatalog))
-		cond := apimeta.FindStatusCondition(extensionCatalog.Status.Conditions, catalogd.TypeUnpacked)
+		cond := apimeta.FindStatusCondition(extensionCatalog.Status.Conditions, catalogd.TypeServing)
 		if !assert.NotNil(ct, cond) {
 			return
 		}
 		assert.Equal(ct, metav1.ConditionTrue, cond.Status)
-		assert.Equal(ct, catalogd.ReasonUnpackSuccessful, cond.Reason)
+		assert.Equal(ct, catalogd.ReasonAvailable, cond.Reason)
 	}, pollDuration, pollInterval)
 
 	t.Log("By eventually reporting a successful resolution and bundle path")
@@ -714,12 +714,12 @@ func TestClusterExtensionInstallReResolvesWhenNewCatalog(t *testing.T) {
 	require.NoError(t, err)
 	require.EventuallyWithT(t, func(ct *assert.CollectT) {
 		assert.NoError(ct, c.Get(context.Background(), types.NamespacedName{Name: extensionCatalog.Name}, extensionCatalog))
-		cond := apimeta.FindStatusCondition(extensionCatalog.Status.Conditions, catalogd.TypeUnpacked)
+		cond := apimeta.FindStatusCondition(extensionCatalog.Status.Conditions, catalogd.TypeServing)
 		if !assert.NotNil(ct, cond) {
 			return
 		}
 		assert.Equal(ct, metav1.ConditionTrue, cond.Status)
-		assert.Equal(ct, catalogd.ReasonUnpackSuccessful, cond.Reason)
+		assert.Equal(ct, catalogd.ReasonAvailable, cond.Reason)
 	}, pollDuration, pollInterval)
 
 	t.Log("By eventually reporting a successful resolution and bundle path")

test/upgrade-e2e/post_upgrade_test.go

@@ -67,12 +67,12 @@ func TestClusterExtensionAfterOLMUpgrade(t *testing.T) {
 	require.EventuallyWithT(t, func(ct *assert.CollectT) {
 		var clusterCatalog catalogdv1alpha1.ClusterCatalog
 		assert.NoError(ct, c.Get(ctx, types.NamespacedName{Name: testClusterCatalogName}, &clusterCatalog))
-		cond := apimeta.FindStatusCondition(clusterCatalog.Status.Conditions, catalogdv1alpha1.TypeUnpacked)
+		cond := apimeta.FindStatusCondition(clusterCatalog.Status.Conditions, catalogdv1alpha1.TypeServing)
 		if !assert.NotNil(ct, cond) {
 			return
 		}
 		assert.Equal(ct, metav1.ConditionTrue, cond.Status)
-		assert.Equal(ct, catalogdv1alpha1.ReasonUnpackSuccessful, cond.Reason)
+		assert.Equal(ct, catalogdv1alpha1.ReasonAvailable, cond.Reason)
 	}, time.Minute, time.Second)
 
 	t.Log("Checking that the ClusterExtension is installed")