Adds review changes

Author: JoshVanL

pkg/tarmak/cluster/cluster.go

@@ -160,15 +160,25 @@ func (c *Cluster) validateInstancePools() error {
 		}
 	}
 
-	if err := c.Environment().Provider().ValidateInstanceTypes(c.InstancePools()); err != nil {
+	return result.ErrorOrNil()
+}
+
+// Verify cluster
+func (c *Cluster) Verify() error {
+	var result *multierror.Error
+
+	if err := c.VerifyInstancePools(); err != nil {
+		result = multierror.Append(result, err)
+	}
+
+	if err := c.Environment().Provider().VerifyInstanceTypes(c.InstancePools()); err != nil {
 		result = multierror.Append(result, err)
 	}
 
 	return result.ErrorOrNil()
 }
 
-// Verify cluster
-func (c *Cluster) Verify() error {
+func (c *Cluster) VerifyInstancePools() (result error) {
 	// Verify instance pools
 	imageIDs, err := c.ImageIDs()
 	if err != nil {

pkg/tarmak/instance_pool/instance_pool.go

@@ -49,7 +49,7 @@ func NewFromConfig(cluster interfaces.Cluster, conf *clusterv1alpha1.InstancePoo
 	provider := cluster.Environment().Provider()
 	instanceType, err := provider.InstanceType(conf.Size)
 	if err != nil {
-		return nil, fmt.Errorf("instanceType '%s' is not valid for this provier", conf.Size)
+		return nil, fmt.Errorf("instanceType '%s' is not valid for this provider: %v", conf.Size, err)
 	}
 	instancePool.instanceType = instanceType
 

pkg/tarmak/interfaces/interfaces.go

@@ -127,7 +127,7 @@ type Provider interface {
 	AskEnvironmentLocation(Initialize) (string, error)
 	AskInstancePoolZones(Initialize) (zones []string, err error)
 	UploadConfiguration(Cluster, io.ReadSeeker) error
-	ValidateInstanceTypes(intstancePools []InstancePool) error
+	VerifyInstanceTypes(intstancePools []InstancePool) error
 }
 
 type Tarmak interface {

pkg/tarmak/provider/amazon/amazon.go

@@ -7,6 +7,7 @@ import (
 	"os"
 	"path/filepath"
 	"sort"
+	"strings"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/credentials"
@@ -71,8 +72,6 @@ type Route53 interface {
 	ListHostedZonesByName(input *route53.ListHostedZonesByNameInput) (*route53.ListHostedZonesByNameOutput, error)
 }
 
-var _ interfaces.Provider = &Amazon{}
-
 func NewFromConfig(tarmak interfaces.Tarmak, conf *tarmakv1alpha1.Provider) (*Amazon, error) {
 
 	a := &Amazon{
@@ -505,7 +504,7 @@ func (a *Amazon) vaultSession() (*session.Session, error) {
 	return sess, nil
 }
 
-func (a *Amazon) ValidateInstanceTypes(instancePools []interfaces.InstancePool) error {
+func (a *Amazon) VerifyInstanceTypes(instancePools []interfaces.InstancePool) error {
 	var result *multierror.Error
 
 	svc, err := a.EC2()
@@ -524,7 +523,9 @@ func (a *Amazon) ValidateInstanceTypes(instancePools []interfaces.InstancePool)
 			result = multierror.Append(result, err)
 		}
 
-		if instance.Name() == "master" {
+		switch instance.Name() {
+
+		case "master":
 			found := false
 			for _, s := range a.nonMasterType() {
 				if s == instanceType {
@@ -534,9 +535,19 @@ func (a *Amazon) ValidateInstanceTypes(instancePools []interfaces.InstancePool)
 			}
 
 			if found {
-				err := fmt.Errorf("type '%s' is not supported for master instance")
+				err := fmt.Errorf("type '%s' is not supported for master instance", instanceType)
+				result = multierror.Append(result, err)
+			}
+			break
+
+		case "etcd", "vault":
+			if a.awsInstanceBurstable(instanceType) {
+				err := fmt.Errorf("instance '%s' does not support burstable type (%s)", instance.Name(), instanceType)
 				result = multierror.Append(result, err)
 			}
+
+			break
+
 		}
 	}
 
@@ -641,8 +652,14 @@ func (a *Amazon) awsVolumeTypes() []string {
 	return []string{"io1", "gp2", "st1", "sc1"}
 }
 
+func (a *Amazon) awsInstanceBurstable(typeName string) bool {
+	return strings.HasPrefix(typeName, "t2.")
+}
+
 func (a *Amazon) awsInstanceTypes() []string {
-	return []string{"c1.medium", "c1.xlarge", "c3.2xlarge", "c3.4xlarge", "c3.8xlarge", "c3.large", "c3.xlarge", "cc2.8xlarge", "cg1.4xlarge", "cr1.8xlarge", "g2.2xlarge", "hi1.4xlarge", "hs1.8xlarge", "i2.2xlarge", "i2.4xlarge", "i2.8xlarge", "i2.xlarge", "m1.large", "m1.medium", "m1.small", "m1.xlarge", "m2.2xlarge", "m2.4xlarge", "m2.xlarge", "m3.2xlarge", "m3.large", "m3.medium", "m3.xlarge", "r3.2xlarge", "r3.4xlarge", "r3.8xlarge", "r3.large", "r3.xlarge", "t1.micro", "t2.medium", "t2.micro", "t2.small", "t2.nano", "t2.micro"}
+	instanceTypes := []string{"t2.nano", "t2.micro", "t2.small", "t2.medium", "t2.large", "t2.xlarge", "t2.2xlarge", "m4.large", "m4.xlarge", "m4.2xlarge", "m4.4xlarge", "m4.10xlarge", "m4.16xlarge", "m5.large", "m5.xlarge", "m5.2xlarge", "m5.4xlarge", "m5.12xlarge", "m5.24xlarge", "m5d.large", "m5d.xlarge", "m5d.2xlarge", "m5d.4xlarge", "m5d.12xlarge", "m5d.24xlarge", "c4.large", "c4.xlarge", "c4.2xlarge", "c4.4xlarge", "c4.8xlarge", "c5.large", "c5.xlarge", "c5.2xlarge", "c5.4xlarge", "c5.9xlarge", "c5.18xlarge", "c5d.xlarge", "c5d.2xlarge", "c5d.4xlarge", "c5d.9xlarge", "c5d.18xlarge", "r4.large", "r4.xlarge", "r4.2xlarge", "r4.4xlarge", "r4.8xlarge", "r4.16xlarge", "x1.16xlarge", "x1.32xlarge", "x1e.xlarge", "x1e.2xlarge", "x1e.4xlarge", "x1e.8xlarge", "x1e.16xlarge", "x1e.32xlarge", "d2.xlarge", "d2.2xlarge", "d2.4xlarge", "d2.8xlarge", "h1.2xlarge", "h1.4xlarge", "h1.8xlarge", "h1.16xlarge", "i3.large", "i3.xlarge", "i3.2xlarge", "i3.4xlarge", "i3.8xlarge", "i3.16xlarge", "i3.metal", "f1.2xlarge", "f1.16xlarge", "g3.4xlarge", "g3.8xlarge", "g3.16xlarge", "p2.xlarge", "p2.8xlarge", "p2.16xlarge", "p3.2xlarge", "p3.8xlarge", "p3.16xlarge"}
+
+	return instanceTypes
 }
 
 func (a *Amazon) nonMasterType() []string {