Skip to content
Permalink
Browse files

Add `pkg/addons/default` to generate targets, strip metadata

  • Loading branch information
errordeveloper committed Mar 7, 2019
1 parent 4debbaa commit 721ea42ebb27ee53b3d284126bf44759a7386a06
Showing with 5 additions and 4 deletions.
  1. +2 −1 Makefile
  2. +2 −2 pkg/addons/default/assets.go
  3. +1 −1 pkg/addons/default/generate.go
@@ -41,6 +41,7 @@ test: generate ## Run unit test (and re-generate code under test)
@$(MAKE) lint
@git diff --exit-code pkg/nodebootstrap/assets.go > /dev/null || (git --no-pager diff pkg/nodebootstrap/assets.go; exit 1)
@git diff --exit-code ./pkg/eks/mocks > /dev/null || (git --no-pager diff ./pkg/eks/mocks; exit 1)
@git diff --exit-code ./pkg/addons/default > /dev/null || (git --no-pager diff ./pkg/addons/default; exit 1)
@$(MAKE) unit-test
@test -z $(COVERALLS_TOKEN) || $(GOPATH)/bin/goveralls -coverprofile=coverage.out -service=circle-ci
@$(MAKE) build-integration-test
@@ -99,7 +100,7 @@ delete-integration-test-dev-cluster: build ## Delete the test cluster for use wh
.PHONY: generate
generate: ## Generate code
@chmod g-w ./pkg/nodebootstrap/assets/*
@go generate ./pkg/nodebootstrap ./pkg/eks/mocks
@go generate ./pkg/nodebootstrap ./pkg/eks/mocks ./pkg/addons/default

.PHONY: generate-ami
generate-ami: ## Generate the list of AMIs for use with static resolver. Queries AWS.

Some generated files are not rendered by default. Learn more.

@@ -3,4 +3,4 @@ package defaultaddons
//go:generate curl --silent --location https://github.com/aws/amazon-vpc-cni-k8s/blob/d40649ec7ea927d6a17c1d862f08d0bd1772897f/config/v1.3/aws-k8s-cni.yaml?raw=1 --output assets/aws-node.yaml
//go:generate curl --silent --location https://amazon-eks.s3-us-west-2.amazonaws.com/cloudformation/2019-02-11/dns.yaml --output assets/coredns.yaml

//go:generate ${GOPATH}/bin/go-bindata -pkg ${GOPACKAGE} -prefix assets -modtime 1 -o assets.go assets
//go:generate ${GOPATH}/bin/go-bindata -pkg ${GOPACKAGE} -prefix assets -nometadata -o assets.go assets

0 comments on commit 721ea42

Please sign in to comment.
You can’t perform that action at this time.