Use ec2.DescribeInstanceTypes for machine type info

kubernetes · May 29, 2020 · 7d0c704 · 7d0c704
1 parent e3fc840
commit 7d0c704
Show file tree

Hide file tree

Showing 24 changed files with 164 additions and 2,908 deletions.
diff --git a/Makefile b/Makefile
@@ -821,13 +821,6 @@ build-docs-netlify:
 	pip install -r ${KOPS_ROOT}/images/mkdocs/requirements.txt
 	mkdocs build
 
-# Update machine_types.go
-.PHONY: update-machine-types
-update-machine-types:
-	go build -o hack/machine_types/machine_types  ${KOPS_ROOT}/hack/machine_types/
-	hack/machine_types/machine_types --out upup/pkg/fi/cloudup/awsup/machine_types.go
-	go fmt upup/pkg/fi/cloudup/awsup/machine_types.go
-
 #-----------------------------------------------------------
 # development targets
 

diff --git a/cloudmock/aws/mockec2/instances.go b/cloudmock/aws/mockec2/instances.go
@@ -49,3 +49,8 @@ func (m *MockEC2) DescribeInstancesPages(request *ec2.DescribeInstancesInput, ca
 func (m *MockEC2) DescribeInstancesPagesWithContext(aws.Context, *ec2.DescribeInstancesInput, func(*ec2.DescribeInstancesOutput, bool) bool, ...request.Option) error {
 	panic("Not implemented")
 }
+
+func (m *MockEC2) DescribeInstanceTypes(*ec2.DescribeInstanceTypesInput) (*ec2.DescribeInstanceTypesOutput, error) {
+	klog.Warningf("MockEc2::DescribeInstanceTypes is stub-implemented")
+	return &ec2.DescribeInstanceTypesOutput{}, nil
+}
diff --git a/cmd/kops/create_cluster.go b/cmd/kops/create_cluster.go
@@ -1293,7 +1293,7 @@ func RunCreateCluster(ctx context.Context, f *util.Factory, out io.Writer, c *Cr
 	}
 
 	strict := false
-	err = validation.DeepValidate(cluster, instanceGroups, strict)
+	err = validation.DeepValidate(cluster, instanceGroups, strict, nil)
 	if err != nil {
 		return err
 	}
@@ -1317,7 +1317,7 @@ func RunCreateCluster(ctx context.Context, f *util.Factory, out io.Writer, c *Cr
 		fullInstanceGroups = append(fullInstanceGroups, fullGroup)
 	}
 
-	err = validation.DeepValidate(fullCluster, fullInstanceGroups, true)
+	err = validation.DeepValidate(fullCluster, fullInstanceGroups, true, nil)
 	if err != nil {
 		return err
 	}

diff --git a/cmd/kops/edit_cluster.go b/cmd/kops/edit_cluster.go
@@ -222,7 +222,7 @@ func RunEditCluster(ctx context.Context, f *util.Factory, cmd *cobra.Command, ar
 			continue
 		}
 
-		err = validation.DeepValidate(fullCluster, instanceGroups, true)
+		err = validation.DeepValidate(fullCluster, instanceGroups, true, nil)
 		if err != nil {
 			results = editResults{
 				file: file,

diff --git a/hack/.packages b/hack/.packages
@@ -33,7 +33,6 @@ k8s.io/kops/dnsprovider/pkg/dnsprovider/providers/openstack/designate
 k8s.io/kops/dnsprovider/pkg/dnsprovider/rrstype
 k8s.io/kops/dnsprovider/pkg/dnsprovider/tests
 k8s.io/kops/examples/kops-api-example
-k8s.io/kops/hack/machine_types
 k8s.io/kops/kube-discovery/cmd/kube-discovery
 k8s.io/kops/node-authorizer/cmd/node-authorizer
 k8s.io/kops/node-authorizer/pkg/authorizers/alwaysallow

diff --git a/hack/machine_types/.gitignore b/hack/machine_types/.gitignore
diff --git a/hack/machine_types/BUILD.bazel b/hack/machine_types/BUILD.bazel
diff --git a/hack/machine_types/README.md b/hack/machine_types/README.md