Misc cleanup (#2074)

Author: deliahu

cli/cmd/cluster.go

@@ -129,7 +129,7 @@ var _clusterCmd = &cobra.Command{
 }
 
 var _clusterUpCmd = &cobra.Command{
-	Use:   "up [CLUSTER_CONFIG_FILE]",
+	Use:   "up CLUSTER_CONFIG_FILE",
 	Short: "spin up a cluster on aws",
 	Args:  cobra.ExactArgs(1),
 	Run: func(cmd *cobra.Command, args []string) {
@@ -743,7 +743,7 @@ func printInfoOperatorResponse(clusterConfig clusterconfig.Config, operatorEndpo
 	infoResponse.ClusterConfig.Config = clusterConfig
 
 	fmt.Println(console.Bold("cluster config:"))
-	fmt.Println(fmt.Sprintf("%s: %s", clusterconfig.APIVersionUserKey, infoResponse.ClusterConfig.APIVersion))
+	fmt.Println(fmt.Sprintf("cluster version: %s", infoResponse.ClusterConfig.APIVersion))
 	fmt.Print(yamlString)
 
 	printInfoPricing(infoResponse, clusterConfig)

docs/clients/cli.md

@@ -98,7 +98,7 @@ Flags:
 spin up a cluster on aws
 
 Usage:
-  cortex cluster up [CLUSTER_CONFIG_FILE] [flags]
+  cortex cluster up CLUSTER_CONFIG_FILE [flags]
 
 Flags:
   -e, --configure-env string   name of environment to configure (default "aws")

docs/clusters/instances/spot.md

@@ -7,7 +7,7 @@ node_groups:
   - name: node-group-1
 
     # whether to use spot instances for this node group (default: false)
-    spot: false
+    spot: false  # this must be set to true to use spot instances
 
     spot_config:
       # additional instance types with identical or better specs than the primary cluster instance type (defaults to only the primary instance type)

docs/clusters/management/create.md

@@ -38,7 +38,7 @@ node_groups:
     instance_volume_size: 50 # disk storage size per instance (GB)
     instance_volume_type: gp2 # instance volume type [gp2 | io1 | st1 | sc1]
     # instance_volume_iops: 3000 # instance volume iops (only applicable to io1)
-    spot: false # enable spot instances
+    spot: false # whether to use spot instances
 
   - name: ng-gpu
     instance_type: g4dn.xlarge
@@ -48,15 +48,6 @@ node_groups:
     instance_volume_type: gp2
     # instance_volume_iops: 3000
     spot: false
-
-  - name: ng-inferentia
-    instance_type: inf1.xlarge
-    min_instances: 1
-    max_instances: 5
-    instance_volume_size: 50
-    instance_volume_type: gp2
-    # instance_volume_iops: 3000
-    spot: false
   ...
 
 # subnet visibility [public (instances will have public IPs) | private (instances will not have public IPs)]

manager/refresh_cluster_config.py

@@ -218,11 +218,6 @@ func GetAllAPIs(pods []kcore.Pod, deployments []kapps.Deployment) ([]schema.APIR
 		return nil, err
 	}
 
-	//allMetrics, err := GetMultipleMetrics(apis)
-	//if err != nil {
-	//	return nil, err
-	//}
-
 	realtimeAPIs := make([]schema.APIResponse, len(apis))
 
 	for i := range apis {
@@ -233,9 +228,8 @@ func GetAllAPIs(pods []kcore.Pod, deployments []kapps.Deployment) ([]schema.APIR
 		}
 
 		realtimeAPIs[i] = schema.APIResponse{
-			Spec:   api,
-			Status: &statuses[i],
-			//Metrics:  &allMetrics[i],
+			Spec:     api,
+			Status:   &statuses[i],
 			Endpoint: endpoint,
 		}
 	}

pkg/operator/resources/asyncapi/api.go

@@ -34,62 +34,23 @@ const (
 	InstanceVolumeIOPSKey                  = "instance_volume_iops"
 	InstancePoolsKey                       = "instance_pools"
 	MaxPriceKey                            = "max_price"
-
-	NetworkKey                    = "network"
-	SubnetKey                     = "subnet"
-	TagsKey                       = "tags"
-	ClusterNameKey                = "cluster_name"
-	RegionKey                     = "region"
-	AvailabilityZonesKey          = "availability_zones"
-	SubnetsKey                    = "subnets"
-	AvailabilityZoneKey           = "availability_zone"
-	SubnetIDKey                   = "subnet_id"
-	SSLCertificateARNKey          = "ssl_certificate_arn"
-	CortexPolicyARNKey            = "cortex_policy_arn"
-	IAMPolicyARNsKey              = "iam_policy_arns"
-	BucketKey                     = "bucket"
-	SubnetVisibilityKey           = "subnet_visibility"
-	NATGatewayKey                 = "nat_gateway"
-	APILoadBalancerSchemeKey      = "api_load_balancer_scheme"
-	OperatorLoadBalancerSchemeKey = "operator_load_balancer_scheme"
-	VPCCIDRKey                    = "vpc_cidr"
-	TelemetryKey                  = "telemetry"
-
-	// User facing string
-	NodeGroupsUserKey                          = "node groups"
-	SpotUserKey                                = "use spot instances"
-	InstanceTypeUserKey                        = "instance type"
-	AcceleratorTypeUserKey                     = "accelerator type"
-	AcceleratorsPerInstanceUserKey             = "accelerators per instance"
-	MinInstancesUserKey                        = "min instances"
-	MaxInstancesUserKey                        = "max instances"
-	InstanceVolumeSizeUserKey                  = "instance volume size (Gi)"
-	InstanceVolumeTypeUserKey                  = "instance volume type"
-	InstanceVolumeIOPSUserKey                  = "instance volume iops"
-	InstanceDistributionUserKey                = "spot instance distribution"
-	OnDemandBaseCapacityUserKey                = "spot on demand base capacity"
-	OnDemandPercentageAboveBaseCapacityUserKey = "spot on demand percentage above base capacity"
-	MaxPriceUserKey                            = "spot max price ($ per hour)"
-	InstancePoolsUserKey                       = "spot instance pools"
-
-	APIVersionUserKey                 = "cluster version"
-	ClusterNameUserKey                = "cluster name"
-	RegionUserKey                     = "aws region"
-	AvailabilityZonesUserKey          = "availability zones"
-	AvailabilityZoneUserKey           = "availability zone"
-	SubnetsUserKey                    = "subnets"
-	SubnetIDUserKey                   = "subnet id"
-	TagsUserKey                       = "tags"
-	SSLCertificateARNUserKey          = "ssl certificate arn"
-	CortexPolicyARNUserKey            = "cortex policy arn"
-	IAMPolicyARNsUserKey              = "iam policy arns"
-	BucketUserKey                     = "s3 bucket"
-	NetworkUserKey                    = "network"
-	SubnetUserKey                     = "subnet"
-	SubnetVisibilityUserKey           = "subnet visibility"
-	NATGatewayUserKey                 = "nat gateway"
-	APILoadBalancerSchemeUserKey      = "api load balancer scheme"
-	OperatorLoadBalancerSchemeUserKey = "operator load balancer scheme"
-	VPCCIDRUserKey                    = "vpc cidr"
-	TelemetryUserKey                  = "telemetry"
+	NetworkKey                             = "network"
+	SubnetKey                              = "subnet"
+	TagsKey                                = "tags"
+	ClusterNameKey                         = "cluster_name"
+	RegionKey                              = "region"
+	AvailabilityZonesKey                   = "availability_zones"
+	SubnetsKey                             = "subnets"
+	AvailabilityZoneKey                    = "availability_zone"
+	SubnetIDKey                            = "subnet_id"
+	SSLCertificateARNKey                   = "ssl_certificate_arn"
+	CortexPolicyARNKey                     = "cortex_policy_arn"
+	IAMPolicyARNsKey                       = "iam_policy_arns"
+	BucketKey                              = "bucket"
+	SubnetVisibilityKey                    = "subnet_visibility"
+	NATGatewayKey                          = "nat_gateway"
+	APILoadBalancerSchemeKey               = "api_load_balancer_scheme"
+	OperatorLoadBalancerSchemeKey          = "operator_load_balancer_scheme"
+	VPCCIDRKey                             = "vpc_cidr"
+	TelemetryKey                           = "telemetry"
 )