From af749ecef37af0b9a8fc0f31975031958641f898 Mon Sep 17 00:00:00 2001
From: Yauheni Kaliuta <ykaliuta@redhat.com>
Date: Fri, 31 May 2024 21:39:34 +0300
Subject: [PATCH] cluster_config: make GetClusterServiceVersion return NotFound
 error (#1028)

GetClusterServiceVersion() may return nil error and nil
pointer. On one hand it's ok to check object for nil in not found
condition but it's a bit counter intuitive to have err nil when
there is acutally "not found"

It caused a problem in GetVersion where this nil condition was not
checked.

Refactor it to return the error and handle it properly.

Signed-off-by: Yauheni Kaliuta <ykaliuta@redhat.com>
---
 pkg/cluster/cluster_config.go | 24 ++++++++++++++++++------
 pkg/cluster/gvk/gvk.go        |  6 ++++++
 pkg/upgrade/uninstallation.go | 26 ++++++++++++++------------
 3 files changed, 38 insertions(+), 18 deletions(-)

diff --git a/pkg/cluster/cluster_config.go b/pkg/cluster/cluster_config.go
index a33c9c9debe..3fb37691d4e 100644
--- a/pkg/cluster/cluster_config.go
+++ b/pkg/cluster/cluster_config.go
@@ -11,7 +11,9 @@ import (
 	"github.com/operator-framework/api/pkg/lib/version"
 	ofapi "github.com/operator-framework/api/pkg/operators/v1alpha1"
 	apiextv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	apierrs "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime/schema"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	"github.com/opendatahub-io/opendatahub-operator/v2/pkg/cluster/gvk"
@@ -58,7 +60,9 @@ func GetClusterServiceVersion(ctx context.Context, c client.Client, watchNameSpa
 		}
 	}
 
-	return nil, nil
+	return nil, apierrs.NewNotFound(
+		schema.GroupResource{Group: gvk.ClusterServiceVersion.Group},
+		gvk.ClusterServiceVersion.Kind)
 }
 
 type Platform string
@@ -131,7 +135,12 @@ type Release struct {
 }
 
 func GetRelease(cli client.Client) (Release, error) {
-	initRelease := Release{}
+	initRelease := Release{
+		// dummy version set to name "", version 0.0.0
+		Version: version.OperatorVersion{
+			Version: semver.Version{},
+		},
+	}
 	// Set platform
 	platform, err := GetPlatform(cli)
 	if err != nil {
@@ -141,18 +150,21 @@ func GetRelease(cli client.Client) (Release, error) {
 
 	// For unit-tests
 	if os.Getenv("CI") == "true" {
-		initRelease.Version = version.OperatorVersion{
-			Version: semver.Version{},
-		}
 		return initRelease, nil
 	}
 	// Set Version
 	// Get watchNamespace
 	operatorNamespace, err := GetOperatorNamespace()
 	if err != nil {
-		return initRelease, err
+		// unit test does not have k8s file
+		fmt.Printf("Falling back to dummy version: %v\n", err)
+		return initRelease, nil
 	}
 	csv, err := GetClusterServiceVersion(context.TODO(), cli, operatorNamespace)
+	if apierrs.IsNotFound(err) {
+		// hide not found, return default
+		return initRelease, nil
+	}
 	if err != nil {
 		return initRelease, err
 	}
diff --git a/pkg/cluster/gvk/gvk.go b/pkg/cluster/gvk/gvk.go
index 2203269eda4..5091283cf6f 100644
--- a/pkg/cluster/gvk/gvk.go
+++ b/pkg/cluster/gvk/gvk.go
@@ -3,6 +3,12 @@ package gvk
 import "k8s.io/apimachinery/pkg/runtime/schema"
 
 var (
+	ClusterServiceVersion = schema.GroupVersionKind{
+		Group:   "operators.coreos.com",
+		Version: "v1alpha1",
+		Kind:    "ClusterServiceVersion",
+	}
+
 	KnativeServing = schema.GroupVersionKind{
 		Group:   "operator.knative.dev",
 		Version: "v1beta1",
diff --git a/pkg/upgrade/uninstallation.go b/pkg/upgrade/uninstallation.go
index 333874f7616..b4a69164dbb 100644
--- a/pkg/upgrade/uninstallation.go
+++ b/pkg/upgrade/uninstallation.go
@@ -141,23 +141,25 @@ func removeCSV(ctx context.Context, c client.Client) error {
 	}
 
 	operatorCsv, err := cluster.GetClusterServiceVersion(ctx, c, operatorNamespace)
+	if apierrs.IsNotFound(err) {
+		fmt.Printf("No clusterserviceversion for the operator found.\n")
+		return nil
+	}
+
 	if err != nil {
 		return err
 	}
 
-	if operatorCsv != nil {
-		fmt.Printf("Deleting CSV %s\n", operatorCsv.Name)
-		err = c.Delete(ctx, operatorCsv)
-		if err != nil {
-			if apierrs.IsNotFound(err) {
-				return nil
-			}
-
-			return fmt.Errorf("error deleting clusterserviceversion: %w", err)
+	fmt.Printf("Deleting CSV %s\n", operatorCsv.Name)
+	err = c.Delete(ctx, operatorCsv)
+	if err != nil {
+		if apierrs.IsNotFound(err) {
+			return nil
 		}
-		fmt.Printf("Clusterserviceversion %s deleted as a part of uninstall.\n", operatorCsv.Name)
-		return nil
+
+		return fmt.Errorf("error deleting clusterserviceversion: %w", err)
 	}
-	fmt.Printf("No clusterserviceversion for the operator found.\n")
+	fmt.Printf("Clusterserviceversion %s deleted as a part of uninstall.\n", operatorCsv.Name)
+
 	return nil
 }