Merge pull request #32 from David-VTUK/fix-autodetection

Update logic to determine if rancher & backup operator is installed.

internal/utils/utils.go

@@ -4,12 +4,11 @@ import (
 	"context"
 	"github.com/david-vtuk/prometheus-rancher-exporter/query/rancher"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 )
 
 var (
-	appGVR = schema.GroupVersionResource{Group: "catalog.cattle.io", Version: "v1", Resource: "apps"}
+	crdGVR = schema.GroupVersionResource{Group: "apiextensions.k8s.io", Version: "v1", Resource: "customresourcedefinitions"}
 )
 
 // CheckInstalledRancherApps Determines if both Rancher and the Backup operator are installed
@@ -18,31 +17,20 @@ func CheckInstalledRancherApps(r rancher.Client) (bool, bool, error) {
 	var rancherInstalled = false
 	var rancherBackupInstalled = false
 
-	res, err := r.Client.Resource(appGVR).List(context.Background(), v1.ListOptions{})
+	res, err := r.Client.Resource(crdGVR).List(context.Background(), v1.ListOptions{})
 	if err != nil {
 		return false, false, err
 	}
 
-	for _, app := range res.Items {
+	for _, customResource := range res.Items {
 
-		appName, _, err := unstructured.NestedString(app.Object, "metadata", "name")
-		if err != nil {
-			return false, false, err
-		}
-
-		appStatus, _, err := unstructured.NestedString(app.Object, "spec", "info", "status")
-		if err != nil {
-			return false, false, err
-		}
-
-		if appName == "rancher" && appStatus == "deployed" {
+		if customResource.GetName() == "catalogs.management.cattle.io" {
 			rancherInstalled = true
 		}
 
-		if appName == "rancher-backup" && appStatus == "deployed" {
+		if customResource.GetName() == "backups.resources.cattle.io" {
 			rancherBackupInstalled = true
 		}
-
 	}
 
 	return rancherInstalled, rancherBackupInstalled, nil