Merge pull request #374 from meshery/leecalcote-aabidsofi19/bug/crd-config

Refactor discovery error handling, update CRD group, and clean up Makefile

Author: aabidsofi19

install/Makefile.core.mk

@@ -26,19 +26,6 @@ GOBIN  = $(GOPATH)/bin
 
 SHELL :=/bin/bash -o pipefail
 
-#-----------------------------------------------------------------------------
-# Components
-#-----------------------------------------------------------------------------
-ADAPTER_URLS := "localhost:10000 localhost:10001 localhost:10002 localhost:10004 localhost:10005 localhost:10006 localhost:10007 localhost:10009 localhost:10010 localhost:10012"
-
-#-----------------------------------------------------------------------------
-# Providers
-#-----------------------------------------------------------------------------
-REMOTE_PROVIDER_LOCAL="http://localhost:9876"
-MESHERY_CLOUD_DEV="http://localhost:9876"
-MESHERY_CLOUD_PROD="https://meshery.layer5.io"
-MESHERY_CLOUD_STAGING="https://staging-meshery.layer5.io"
-
 #-----------------------------------------------------------------------------
 # Server
 #-----------------------------------------------------------------------------

internal/config/crd_config.go

@@ -17,11 +17,11 @@ import (
 )
 
 var (
-	namespace = "meshery"           // Namespace for the Custom Resource
-	crName    = "meshery-meshsync"  // Name of the custom resource
-	version   = "v1alpha1"          // Version of the Custom Resource
-	group     = "meshery.layer5.io" //Group for the Custom Resource
-	resource  = "meshsyncs"         //Name of the Resource
+	namespace = "meshery"          // Namespace for the Custom Resource
+	crName    = "meshery-meshsync" // Name of the custom resource
+	version   = "v1alpha1"         // Version of the Custom Resource
+	group     = "meshery.io"       //Group for the Custom Resource
+	resource  = "meshsyncs"        //Name of the Resource
 )
 
 func GetMeshsyncCRDConfigs(dyClient dynamic.Interface) (*MeshsyncConfig, error) {

internal/config/crd_config_test.go

@@ -13,8 +13,8 @@ import (
 
 var (
 	Kind         string = "MeshSync"
-	APIVersion   string = "meshery.layer5.io/v1alpha1"
-	URL          string = "https://layer5.io"
+	APIVersion   string = "meshery.io/v1alpha1"
+	URL          string = "https://meshery.io"
 	fakeDyClient *fake.FakeDynamicClient
 	ctx          = context.Background()
 )
@@ -107,8 +107,8 @@ func TestBlackListResources(t *testing.T) {
 	// excempted local pipelines: pods, replicasets
 
 	// counting expected pipelines after blacklist
-	expectedGlobalCount := len(meshsyncConfig.Pipelines["global"]) - 1 	//excluding namespaces
-	expectedLocalCount := len(meshsyncConfig.Pipelines["local"]) - 2 	//excluding pods, replicasets
+	expectedGlobalCount := len(meshsyncConfig.Pipelines["global"]) - 1 //excluding namespaces
+	expectedLocalCount := len(meshsyncConfig.Pipelines["local"]) - 2   //excluding pods, replicasets
 
 	if len(meshsyncConfig.Pipelines["global"]) != expectedGlobalCount {
 		t.Errorf("global pipelines not well configured expected %d", expectedGlobalCount)

internal/config/error.go

@@ -9,5 +9,5 @@ const (
 )
 
 func ErrInitConfig(err error) error {
-	return errors.New(ErrInitConfigCode, errors.Alert, []string{"Error while config init", err.Error()}, []string{}, []string{}, []string{})
+	return errors.New(ErrInitConfigCode, errors.Alert, []string{"Error while initializing MeshSync configuration. ", err.Error()}, []string{"Missing or outdated CRD. "}, []string{"Missing or outdated CRD."}, []string{"Confirm that meshsyncs custom resource is present in the cluster."})
 }

internal/pipeline/step.go

@@ -1,6 +1,8 @@
 package pipeline
 
 import (
+	"fmt"
+
 	broker "github.com/layer5io/meshkit/broker"
 	"github.com/layer5io/meshkit/logger"
 	internalconfig "github.com/layer5io/meshsync/internal/config"
@@ -32,6 +34,13 @@ func newRegisterInformerStep(log logger.Handler, informer dynamicinformer.Dynami
 // Exec - step interface
 func (ri *RegisterInformer) Exec(request *pipeline.Request) *pipeline.Result {
 	gvr, _ := schema.ParseResourceArg(ri.config.Name)
+	if gvr == nil {
+		return &pipeline.Result{
+			Error: internalconfig.ErrInitConfig(fmt.Errorf("error parsing resource arg, gvr not found")),
+			Data:  nil,
+		}
+	}
+
 	iclient := ri.informer.ForResource(*gvr)
 
 	ri.registerHandlers(iclient.Informer())