WIP GCP

Author: RobertLucian

cli/cmd/gcp_cluster.go

@@ -83,19 +83,22 @@ func upGCP(gcpPath string) {
 	}
 
 	GCP := &gcp.Client{}
-	err = GCP.CreateBucket(gcpConfig.Bucket, gcpConfig.Project, true)
-	if err != nil {
+	if exists, err := GCP.BucketExists(gcpConfig.Bucket); err != nil {
 		exit.Error(err)
+	} else if !exists {
+		err = GCP.CreateBucket(gcpConfig.Bucket, gcpConfig.Project)
+		if err != nil {
+			exit.Error(err)
+		}
 	}
 
 	fmt.Print("￮ spinning up a cluster .")
 
 	parent := fmt.Sprintf("projects/%s/locations/%s", gcpConfig.Project, gcpConfig.Zone)
-	clusterName := gcpConfig.ClusterName
 	request := containerpb.CreateClusterRequest{
 		Parent: parent,
 		Cluster: &containerpb.Cluster{
-			Name: clusterName,
+			Name: gcpConfig.ClusterName,
 			NodePools: []*containerpb.NodePool{
 				{
 					Name: "ng-cortex-operator",
@@ -159,14 +162,22 @@ func upGCP(gcpPath string) {
 	for {
 		time.Sleep(10 * time.Second)
 		req := &containerpb.GetClusterRequest{
-			Name: fmt.Sprintf("%s/clusters/%s", parent, clusterName),
+			Name: fmt.Sprintf("%s/clusters/%s", parent, gcpConfig.ClusterName),
 		}
 
 		resp, err := c.GetCluster(ctx, req)
 		if err != nil {
 			exit.Error(err)
 		}
 
+		if resp.Status == containerpb.Cluster_ERROR {
+			fmt.Println(" ✗")
+			helpStr := fmt.Sprintf("\nyour cluster couldn't be spun up; here is the error that was encountered: %s", resp.StatusMessage)
+			helpStr += fmt.Sprintf("\nadditional error information may be found on the cluster's page in the GCP console: https://console.cloud.google.com/kubernetes/clusters/details/%s/%s?project=%s", gcpConfig.Zone, gcpConfig.ClusterName, gcpConfig.Project)
+			fmt.Println(helpStr)
+			exit.Error(ErrorClusterUp(resp.StatusMessage))
+		}
+
 		if resp.Status != containerpb.Cluster_PROVISIONING {
 			fmt.Println(" ✓")
 			break

pkg/lib/gcp/gcs.go

@@ -25,26 +25,31 @@ import (
 	"cloud.google.com/go/storage"
 	"github.com/cortexlabs/cortex/pkg/lib/errors"
 	s "github.com/cortexlabs/cortex/pkg/lib/strings"
-	"google.golang.org/api/googleapi"
 	"google.golang.org/api/iterator"
 )
 
 func GCSPath(bucket string, key string) string {
 	return "gs://" + filepath.Join(bucket, key)
 }
 
-func (c *Client) CreateBucket(bucket, projectID string, ignoreErrorIfBucketExists bool) error {
+func (c *Client) BucketExists(bucket string) (bool, error) {
+	gcsClient, err := c.GCS()
+	if err != nil {
+		return false, err
+	}
+	_, err = gcsClient.Bucket(bucket).Attrs(context.Background())
+	// TODO fix this
+	return err == nil, nil
+}
+
+func (c *Client) CreateBucket(bucket, projectID string) error {
 	gcsClient, err := c.GCS()
 	if err != nil {
 		return err
 	}
 	err = gcsClient.Bucket(bucket).Create(context.Background(), projectID, nil)
 	if err != nil {
-		if e, ok := err.(*googleapi.Error); ok && e.Code == 409 && !ignoreErrorIfBucketExists {
-			return err
-		} else if !ok || (ok && e.Code != 409) {
-			return err
-		}
+		return err
 	}
 	return nil
 }

pkg/types/spec/validations.go

@@ -1421,10 +1421,6 @@ func validateCompute(api *userconfig.API, providerType types.ProviderType) error
 		return ErrorUnsupportedComputeResourceForProvider(userconfig.InfKey, providerType)
 	}
 
-	if compute.GPU > 0 && providerType == types.GCPProviderType {
-		return ErrorUnsupportedComputeResourceForProvider(userconfig.GPUKey, providerType)
-	}
-
 	if compute.Inf > 0 && api.Predictor.Type == userconfig.ONNXPredictorType {
 		return ErrorFieldNotSupportedByPredictorType(userconfig.InfKey, api.Predictor.Type)
 	}