Skip to content

Commit

Permalink
Merge pull request #615 from weaveworks/addons-assets
Browse files Browse the repository at this point in the history
Assets for `aws-node` and `coredns` add-ons
  • Loading branch information
errordeveloper authored Mar 7, 2019
2 parents a3ce559 + 721ea42 commit 2f5f30e
Show file tree
Hide file tree
Showing 10 changed files with 1,380 additions and 1 deletion.
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand Down
Loading

0 comments on commit 2f5f30e

Please sign in to comment.