Fix make operator-local command (#2171)

Author: RobertLucian

pkg/config/config.go

@@ -24,6 +24,7 @@ import (
 	"github.com/cortexlabs/cortex/pkg/consts"
 	batch "github.com/cortexlabs/cortex/pkg/crds/apis/batch/v1alpha1"
 	"github.com/cortexlabs/cortex/pkg/lib/aws"
+	cr "github.com/cortexlabs/cortex/pkg/lib/configreader"
 	"github.com/cortexlabs/cortex/pkg/lib/errors"
 	"github.com/cortexlabs/cortex/pkg/lib/hash"
 	"github.com/cortexlabs/cortex/pkg/lib/k8s"
@@ -60,6 +61,20 @@ func InitConfigs(clusterConfig *clusterconfig.Config, operatorMetadata *clusterc
 	OperatorMetadata = operatorMetadata
 }
 
+func getClusterConfigFromConfigMap() (clusterconfig.Config, error) {
+	configMapData, err := K8s.GetConfigMapData("cluster-config")
+	if err != nil {
+		return clusterconfig.Config{}, err
+	}
+	clusterConfig := clusterconfig.Config{}
+	err = cr.ParseYAMLBytes(&clusterConfig, clusterconfig.FullManagedValidation, []byte(configMapData["cluster.yaml"]))
+	if err != nil {
+		return clusterconfig.Config{}, err
+	}
+
+	return clusterConfig, nil
+}
+
 func Init() error {
 	var err error
 	var clusterNamespace string
@@ -103,6 +118,22 @@ func Init() error {
 	clusterNamespace = clusterConfig.Namespace
 	istioNamespace = clusterConfig.IstioNamespace
 
+	if K8s, err = k8s.New(clusterNamespace, OperatorMetadata.IsOperatorInCluster, nil, scheme); err != nil {
+		return err
+	}
+
+	if K8sIstio, err = k8s.New(istioNamespace, OperatorMetadata.IsOperatorInCluster, nil, scheme); err != nil {
+		return err
+	}
+
+	if !OperatorMetadata.IsOperatorInCluster {
+		cc, err := getClusterConfigFromConfigMap()
+		if err != nil {
+			return err
+		}
+		clusterConfig.Bucket = cc.Bucket
+	}
+
 	exists, err := AWS.DoesBucketExist(clusterConfig.Bucket)
 	if err != nil {
 		return err
@@ -126,14 +157,6 @@ func Init() error {
 		fmt.Println(errors.Message(err))
 	}
 
-	if K8s, err = k8s.New(clusterNamespace, OperatorMetadata.IsOperatorInCluster, nil, scheme); err != nil {
-		return err
-	}
-
-	if K8sIstio, err = k8s.New(istioNamespace, OperatorMetadata.IsOperatorInCluster, nil, scheme); err != nil {
-		return err
-	}
-
 	prometheusURL := os.Getenv("CORTEX_PROMETHEUS_URL")
 	if len(prometheusURL) == 0 {
 		prometheusURL = fmt.Sprintf("http://prometheus.%s:9090", clusterNamespace)

pkg/lib/configreader/reader.go

@@ -1038,6 +1038,20 @@ func ParseYAMLFile(dest interface{}, validation *StructValidation, filePath stri
 	return nil
 }
 
+func ParseYAMLBytes(dest interface{}, validation *StructValidation, data []byte) error {
+	fileInterface, err := ReadYAMLBytes(data)
+	if err != nil {
+		return nil
+	}
+
+	errs := Struct(dest, fileInterface, validation)
+	if errors.HasError(errs) {
+		return errors.FirstError(errs...)
+	}
+
+	return nil
+}
+
 func ReadYAMLFile(filePath string) (interface{}, error) {
 	fileBytes, err := files.ReadFileBytes(filePath)
 	if err != nil {