Make --print-config display yaml that is consumable by cortex configure (#2324)

Author: vishalbollu

cli/cmd/cluster.go

@@ -455,8 +455,10 @@ var _clusterInfoCmd = &cobra.Command{
 
 		if _flagClusterInfoDebug {
 			cmdDebug(awsClient, accessConfig)
+		} else if _flagClusterInfoPrintConfig {
+			cmdPrintConfig(awsClient, accessConfig, _flagOutput)
 		} else {
-			cmdInfo(awsClient, accessConfig, stacks, _flagClusterInfoPrintConfig, _flagOutput, _flagClusterDisallowPrompt)
+			cmdInfo(awsClient, accessConfig, stacks, _flagOutput, _flagClusterDisallowPrompt)
 		}
 	},
 }
@@ -853,7 +855,27 @@ var _clusterHealthCmd = &cobra.Command{
 	},
 }
 
-func cmdInfo(awsClient *awslib.Client, accessConfig *clusterconfig.AccessConfig, stacks clusterstate.ClusterStacks, printConfig bool, outputType flags.OutputType, disallowPrompt bool) {
+func cmdPrintConfig(awsClient *awslib.Client, accessConfig *clusterconfig.AccessConfig, outputType flags.OutputType) {
+	clusterConfig := refreshCachedClusterConfig(awsClient, accessConfig, outputType == flags.PrettyOutputType)
+
+	infoInterface := clusterConfig.CoreConfig
+
+	if outputType == flags.JSONOutputType {
+		outputBytes, err := libjson.Marshal(infoInterface)
+		if err != nil {
+			exit.Error(err)
+		}
+		fmt.Println(string(outputBytes))
+	} else {
+		outputBytes, err := yaml.Marshal(infoInterface)
+		if err != nil {
+			exit.Error(err)
+		}
+		fmt.Println(string(outputBytes))
+	}
+}
+
+func cmdInfo(awsClient *awslib.Client, accessConfig *clusterconfig.AccessConfig, stacks clusterstate.ClusterStacks, outputType flags.OutputType, disallowPrompt bool) {
 	clusterConfig := refreshCachedClusterConfig(awsClient, accessConfig, outputType == flags.PrettyOutputType)
 
 	operatorLoadBalancer, err := getLoadBalancer(accessConfig.ClusterName, OperatorLoadBalancer, awsClient)
@@ -875,18 +897,13 @@ func cmdInfo(awsClient *awslib.Client, accessConfig *clusterconfig.AccessConfig,
 		}
 		infoResponse.ClusterConfig.Config = clusterConfig
 
-		var infoInterface interface{}
-		if printConfig {
-			infoInterface = infoResponse.ClusterConfig.Config
-		} else {
-			infoInterface = map[string]interface{}{
-				"cluster_config":      infoResponse.ClusterConfig.Config,
-				"cluster_metadata":    infoResponse.ClusterConfig.OperatorMetadata,
-				"worker_node_infos":   infoResponse.WorkerNodeInfos,
-				"operator_node_infos": infoResponse.OperatorNodeInfos,
-				"endpoint_operator":   operatorEndpoint,
-				"endpoint_api":        apiEndpoint,
-			}
+		infoInterface := map[string]interface{}{
+			"cluster_config":      infoResponse.ClusterConfig.Config,
+			"cluster_metadata":    infoResponse.ClusterConfig.OperatorMetadata,
+			"worker_node_infos":   infoResponse.WorkerNodeInfos,
+			"operator_node_infos": infoResponse.OperatorNodeInfos,
+			"endpoint_operator":   operatorEndpoint,
+			"endpoint_api":        apiEndpoint,
 		}
 
 		var outputBytes []byte

cli/cmd/lib_cluster_config.go

@@ -61,7 +61,7 @@ func existingCachedClusterConfigPaths() []string {
 }
 
 func readCachedClusterConfigFile(clusterConfig *clusterconfig.Config, filePath string) error {
-	errs := cr.ParseYAMLFile(clusterConfig, clusterconfig.FullManagedValidation, filePath)
+	errs := cr.ParseYAMLFile(clusterConfig, clusterconfig.FullConfigValidation, filePath)
 	if errors.HasError(errs) {
 		return errors.FirstError(errs...)
 	}
@@ -70,7 +70,7 @@ func readCachedClusterConfigFile(clusterConfig *clusterconfig.Config, filePath s
 }
 
 func readUserClusterConfigFile(clusterConfig *clusterconfig.Config, filePath string) error {
-	errs := cr.ParseYAMLFile(clusterConfig, clusterconfig.FullManagedValidation, filePath)
+	errs := cr.ParseYAMLFile(clusterConfig, clusterconfig.FullConfigValidation, filePath)
 	if errors.HasError(errs) {
 		return errors.Append(errors.FirstError(errs...), fmt.Sprintf("\n\ncluster configuration schema can be found at https://docs.cortex.dev/v/%s/", consts.CortexVersionMinor))
 	}

pkg/config/config.go

@@ -68,7 +68,7 @@ func getClusterConfigFromConfigMap() (clusterconfig.Config, error) {
 		return clusterconfig.Config{}, err
 	}
 	clusterConfig := clusterconfig.Config{}
-	err = cr.ParseYAMLBytes(&clusterConfig, clusterconfig.FullManagedValidation, []byte(configMapData["cluster.yaml"]))
+	err = cr.ParseYAMLBytes(&clusterConfig, clusterconfig.FullConfigValidation, []byte(configMapData["cluster.yaml"]))
 	if err != nil {
 		return clusterconfig.Config{}, err
 	}
@@ -78,8 +78,6 @@ func getClusterConfigFromConfigMap() (clusterconfig.Config, error) {
 
 func Init() error {
 	var err error
-	var clusterNamespace string
-	var istioNamespace string
 
 	clusterConfigPath := os.Getenv("CORTEX_CLUSTER_CONFIG_PATH")
 	if clusterConfigPath == "" {
@@ -112,14 +110,11 @@ func Init() error {
 		IsOperatorInCluster: strings.ToLower(os.Getenv("CORTEX_OPERATOR_IN_CLUSTER")) != "false",
 	}
 
-	clusterNamespace = clusterConfig.Namespace
-	istioNamespace = clusterConfig.IstioNamespace
-
-	if K8s, err = k8s.New(clusterNamespace, OperatorMetadata.IsOperatorInCluster, nil, scheme); err != nil {
+	if K8s, err = k8s.New(consts.DefaultNamespace, OperatorMetadata.IsOperatorInCluster, nil, scheme); err != nil {
 		return err
 	}
 
-	if K8sIstio, err = k8s.New(istioNamespace, OperatorMetadata.IsOperatorInCluster, nil, scheme); err != nil {
+	if K8sIstio, err = k8s.New(consts.IstioNamespace, OperatorMetadata.IsOperatorInCluster, nil, scheme); err != nil {
 		return err
 	}
 
@@ -157,7 +152,7 @@ func Init() error {
 
 	prometheusURL := os.Getenv("CORTEX_PROMETHEUS_URL")
 	if len(prometheusURL) == 0 {
-		prometheusURL = fmt.Sprintf("http://prometheus.%s:9090", clusterNamespace)
+		prometheusURL = fmt.Sprintf("http://prometheus.%s:9090", consts.DefaultNamespace)
 	}
 
 	promClient, err := promapi.NewClient(promapi.Config{
@@ -172,9 +167,11 @@ func Init() error {
 		return err
 	}
 
-	MetricsClient, err = statsd.New("prometheus-statsd-exporter.default:9125")
-	if err != nil {
-		return errors.Wrap(errors.WithStack(err), "unable to initialize metrics client")
+	if OperatorMetadata.IsOperatorInCluster {
+		MetricsClient, err = statsd.New(fmt.Sprintf("prometheus-statsd-exporter.%s:9125", consts.DefaultNamespace))
+		if err != nil {
+			return errors.Wrap(errors.WithStack(err), "unable to initialize metrics client")
+		}
 	}
 
 	return nil

pkg/consts/consts.go

@@ -27,6 +27,9 @@ var (
 	CortexVersion      = "master" // CORTEX_VERSION
 	CortexVersionMinor = "master" // CORTEX_VERSION_MINOR
 
+	DefaultNamespace = "default"
+	IstioNamespace   = "istio-system"
+
 	DefaultMaxQueueLength = int64(100)
 	DefaultMaxConcurrency = int64(1)
 

pkg/crds/controllers/batch/batchjob_controller_helpers.go

@@ -529,7 +529,7 @@ func (r *BatchJobReconciler) updateStatus(ctx context.Context, batchJob *batch.B
 func (r *BatchJobReconciler) checkWorkersOOM(ctx context.Context, batchJob *batch.BatchJob) (bool, error) {
 	workerJobPods := kcore.PodList{}
 	if err := r.List(ctx, &workerJobPods,
-		client.InNamespace(r.ClusterConfig.Namespace),
+		client.InNamespace(consts.DefaultNamespace),
 		client.MatchingLabels{
 			"jobID":   batchJob.Name,
 			"apiName": batchJob.Spec.APIName,

pkg/crds/main.go

@@ -105,7 +105,7 @@ func main() {
 	}
 
 	if prometheusURL == "" {
-		prometheusURL = fmt.Sprintf("http://prometheus.%s:9090", clusterConfig.Namespace)
+		prometheusURL = fmt.Sprintf("http://prometheus.%s:9090", consts.DefaultNamespace)
 	}
 
 	mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{

pkg/operator/operator/cron.go

@@ -84,7 +84,6 @@ func ClusterTelemetry() error {
 	}
 	telemetry.Event("operator.cron", properties,
 		config.ClusterConfig.CoreConfig.TelemetryEvent(),
-		config.ClusterConfig.ManagedConfig.TelemetryEvent(),
 	)
 
 	return nil

pkg/operator/resources/realtimeapi/k8s_specs.go

@@ -19,7 +19,6 @@ package realtimeapi
 import (
 	"fmt"
 
-	"github.com/cortexlabs/cortex/pkg/config"
 	"github.com/cortexlabs/cortex/pkg/consts"
 	"github.com/cortexlabs/cortex/pkg/lib/k8s"
 	"github.com/cortexlabs/cortex/pkg/lib/pointer"
@@ -135,7 +134,7 @@ func virtualServiceSpec(api *spec.API) *istioclientnetworking.VirtualService {
 							consts.CortexTargetServiceHeader: fmt.Sprintf(
 								"http://%s.%s:%d",
 								workloads.K8sName(api.Name),
-								config.ClusterConfig.Namespace,
+								consts.DefaultNamespace,
 								consts.ProxyPortInt32,
 							),
 						},