Block mac instances

dev/versions.md

@@ -96,7 +96,7 @@ see https://github.com/moby/moby/issues/39302#issuecomment-639687466_
 1. `rm -rf go.mod go.sum && go mod init && go clean -modcache`
 1. `go get k8s.io/client-go@v0.17.6 && go get k8s.io/apimachinery@v0.17.6 && go get k8s.io/api@v0.17.6`
 1. `go get istio.io/client-go@1.7.3 && go get istio.io/api@1.7.3`
-1. `go get github.com/aws/amazon-vpc-cni-k8s/pkg/awsutils@v1.7.10`
+1. `go get github.com/aws/amazon-vpc-cni-k8s/pkg/awsutils@v1.8.0`
 1. `go get github.com/cortexlabs/yaml@581aea36a2e4db10f8696587e48cac5248d64f4d`
 1. `go get github.com/cortexlabs/go-input@8b67a7a7b28d1c45f5c588171b3b50148462b247`
 1. `echo -e '\nreplace github.com/docker/docker => github.com/docker/engine v19.03.12' >> go.mod`

pkg/lib/aws/ec2.go

@@ -120,6 +120,19 @@ func IsAMDGPUInstance(instanceType string) (bool, error) {
 	return false, nil
 }
 
+func IsMacInstance(instanceType string) (bool, error) {
+	parsedType, err := ParseInstanceType(instanceType)
+	if err != nil {
+		return false, err
+	}
+
+	if parsedType.Family == "mac" {
+		return true, nil
+	}
+
+	return false, nil
+}
+
 func (c *Client) SpotInstancePrice(instanceType string) (float64, error) {
 	result, err := c.EC2().DescribeSpotPriceHistory(&ec2.DescribeSpotPriceHistoryInput{
 		InstanceTypes:       []*string{aws.String(instanceType)},

pkg/types/clusterconfig/cluster_config.go

@@ -1451,6 +1451,14 @@ func validateInstanceType(instanceType string) (string, error) {
 		return "", ErrorAMDGPUInstancesNotSupported(instanceType)
 	}
 
+	isMac, err := aws.IsMacInstance(instanceType)
+	if err != nil {
+		return "", err
+	}
+	if isMac {
+		return "", ErrorMacInstancesNotSupported(instanceType)
+	}
+
 	if _, ok := awsutils.InstanceNetworkingLimits[instanceType]; !ok {
 		return "", ErrorInstanceTypeNotSupportedByCortex(instanceType)
 	}

pkg/types/clusterconfig/errors.go

@@ -47,6 +47,7 @@ const (
 	ErrSpotPriceGreaterThanMaxPrice           = "clusterconfig.spot_price_greater_than_max_price"
 	ErrInstanceTypeNotSupportedByCortex       = "clusterconfig.instance_type_not_supported_by_cortex"
 	ErrAMDGPUInstancesNotSupported            = "clusterconfig.amd_gpu_instances_not_supported"
+	ErrMacInstancesNotSupported               = "clusterconfig.mac_instances_not_supported"
 	ErrAtLeastOneInstanceDistribution         = "clusterconfig.at_least_one_instance_distribution"
 	ErrNoCompatibleSpotInstanceFound          = "clusterconfig.no_compatible_spot_instance_found"
 	ErrConfiguredWhenSpotIsNotEnabled         = "clusterconfig.configured_when_spot_is_not_enabled"
@@ -209,6 +210,13 @@ func ErrorAMDGPUInstancesNotSupported(instanceType string) error {
 	})
 }
 
+func ErrorMacInstancesNotSupported(instanceType string) error {
+	return errors.WithStack(&errors.Error{
+		Kind:    ErrMacInstancesNotSupported,
+		Message: fmt.Sprintf("mac instances (including %s) are not supported by cortex", instanceType),
+	})
+}
+
 func ErrorConfiguredWhenSpotIsNotEnabled(configKey string) error {
 	return errors.WithStack(&errors.Error{
 		Kind:    ErrConfiguredWhenSpotIsNotEnabled,