Merge pull request #2661 from neha-viswanathan/deprecate-static-ami-r…

…esolver

Deprecate static AMI resolver

Makefile

@@ -177,11 +177,6 @@ generate-all: generate-always $(conditionally_generated_files) ## Re-generate al
 check-all-generated-files-up-to-date: generate-all
 	git diff --quiet -- $(all_generated_files) || (git --no-pager diff $(all_generated_files); echo "HINT: to fix this, run 'git commit $(all_generated_files) --message \"Update generated files\"'"; exit 1)
 
-### Update AMIs in ami static resolver
-.PHONY: update-ami
-update-ami: ## Generate the list of AMIs for use with static resolver. Queries AWS.
-	go generate ./pkg/ami
-
 ### Update maxpods.go from AWS
 .PHONY: update-maxpods
 update-maxpods: ## Re-download the max pods info from AWS and regenerate the maxpods.go file

README.md

@@ -72,7 +72,6 @@ A cluster will be created with default parameters
 - use official AWS EKS AMI
 - `us-west-2` region
 - dedicated VPC (check your quotas)
-- using static AMI resolver
 
 Once you have created a cluster, you will find that cluster credentials were added in `~/.kube/config`. If you have `kubectl` v1.10.x as well as `aws-iam-authenticator` commands in your PATH, you should be
 able to use `kubectl`. You will need to make sure to use the same AWS API credentials for this also. Check [EKS docs][ekskubectl] for instructions. If you installed `eksctl` via Homebrew, you should have all of these dependencies installed already.

pkg/ami/resolver.go

@@ -39,14 +39,6 @@ type Resolver interface {
 	Resolve(region, version, instanceType, imageFamily string) (string, error)
 }
 
-// NewStaticResolver returns a static resolver that delegates on
-// StaticGPUResolver, StaticBottlerocketResolver, and StaticDefaultResolver.
-func NewStaticResolver() Resolver {
-	return &MultiResolver{
-		delegates: []Resolver{&StaticGPUResolver{}, &StaticBottlerocketResolver{}, &StaticDefaultResolver{}},
-	}
-}
-
 // NewMultiResolver creates and returns a MultiResolver with the specified delegates
 func NewMultiResolver(delegates ...Resolver) *MultiResolver {
 	return &MultiResolver{