Skip to content

Commit f2257db

Browse files
authoredMar 9, 2022
Merge pull request #31 from aws/feature/failure-domains
feature/failure domains
2 parents 465c0fa + 8c7c929 commit f2257db

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+1571
-1794
lines changed
 

‎.gitignore

+4
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66
*.dylib
77
bin
88
testbin/*
9+
api/*/zz*generated.deepcopy.go
10+
11+
nginx.conf
12+
nginx.conf.bak
913

1014
pkg/mocks/*
1115
!pkg/mocks/.keep

‎Makefile

+4-8
Original file line numberDiff line numberDiff line change
@@ -74,16 +74,12 @@ api/%/zz_generated.deepcopy.go: bin/controller-gen $(DEEPCOPY_GEN_INPUTS)
7474

7575
MANAGER_BIN_INPUTS=$(shell find ./controllers ./api ./pkg -name "*mock*" -prune -o -name "*test*" -prune -o -type f -print) main.go go.mod go.sum
7676
.PHONY: build
77-
build: binaries generate-mocks generate-deepcopy manifests release-manifests ## Build manager binary.
77+
build: binaries generate-deepcopy lint manifests release-manifests ## Build manager binary.
7878
bin/manager: $(MANAGER_BIN_INPUTS)
79-
go fmt ./...
80-
go vet ./...
8179
go build -o bin/manager main.go
8280

8381
.PHONY: run
84-
run: generate-deepcopy fmt vet ## Run a controller from your host.
85-
go fmt ./...
86-
go vet ./...
82+
run: generate-deepcopy ## Run a controller from your host.
8783
go run ./main.go
8884

8985
# Using a flag file here as docker build doesn't produce a target file.
@@ -163,14 +159,14 @@ clean: ## Clean.
163159
export KUBEBUILDER_ASSETS=$(PROJECT_DIR)/bin
164160

165161
.PHONY: test
166-
test: generate-mocks lint generate-deepcopy bin/ginkgo bin/kubectl bin/kube-apiserver bin/etcd ## Run tests. At the moment this is only unit tests.
162+
test: generate-mocks lint bin/ginkgo bin/kubectl bin/kube-apiserver bin/etcd ## Run tests. At the moment this is only unit tests.
167163
@./hack/testing_ginkgo_recover_statements.sh --add # Add ginkgo.GinkgoRecover() statements to controllers.
168164
@# The following is a slightly funky way to make sure the ginkgo statements are removed regardless the test results.
169165
@ginkgo -v ./api/... ./controllers/... ./pkg/... -coverprofile cover.out; EXIT_STATUS=$$?;\
170166
./hack/testing_ginkgo_recover_statements.sh --remove; exit $$EXIT_STATUS
171167

172168
.PHONY: generate-mocks
173-
generate-mocks: bin/mockgen pkg/mocks/mock_client.go $(shell find ./pkg/mocks -type f -name "mock*.go") ## Generate mocks needed for testing. Primarily mocks of the cloud package.
169+
generate-mocks: bin/mockgen generate-deepcopy pkg/mocks/mock_client.go $(shell find ./pkg/mocks -type f -name "mock*.go") ## Generate mocks needed for testing. Primarily mocks of the cloud package.
174170
pkg/mocks/mock%.go: $(shell find ./pkg/cloud -type f -name "*test*" -prune -o -print)
175171
go generate ./...
176172

0 commit comments

Comments
 (0)
Please sign in to comment.