Skip to content

Commit

Permalink
✨ Ship CABPK as part of CAPI
Browse files Browse the repository at this point in the history
Signed-off-by: Vince Prignano <vincepri@vmware.com>
  • Loading branch information
vincepri committed Oct 15, 2019
1 parent b23a29e commit 1ef1f78
Show file tree
Hide file tree
Showing 144 changed files with 42 additions and 12,716 deletions.
19 changes: 12 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -124,11 +124,12 @@ generate: $(CONTROLLER_GEN) ## Generate code
generate-go: $(CONTROLLER_GEN) $(CONVERSION_GEN) ## Runs Go related generate targets
$(CONTROLLER_GEN) \
object:headerFile=./hack/boilerplate/boilerplate.generatego.txt \
paths=./api/...
paths=./api/... \
paths=./bootstrap/kubeadm/api/...
$(CONVERSION_GEN) \
--input-dirs=./api/v1alpha2 \
--output-file-base=zz_generated.conversion \
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt
--input-dirs=./api/v1alpha2 \
--output-file-base=zz_generated.conversion \
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt

.PHONY: generate-manifests
generate-manifests: $(CONTROLLER_GEN) ## Generate manifests e.g. CRD, RBAC etc.
Expand All @@ -138,6 +139,11 @@ generate-manifests: $(CONTROLLER_GEN) ## Generate manifests e.g. CRD, RBAC etc.
crd \
rbac:roleName=manager-role \
output:crd:dir=./config/crd/bases
$(CONTROLLER_GEN) \
paths=./bootstrap/kubeadm/api/... \
paths=./bootstrap/kubeadm/controllers/... \
crd:trivialVersions=true \
output:crd:dir=./config/crd/bases
## Copy files in CI folders.
cp -f ./config/rbac/*.yaml ./config/ci/rbac/
cp -f ./config/manager/manager*.yaml ./config/ci/manager/
Expand Down Expand Up @@ -286,19 +292,18 @@ clean-release: ## Remove the release folder
verify:
./hack/verify-boilerplate.sh
./hack/verify-doctoc.sh
./hack/verify-generated-files.sh
$(MAKE) verify-modules
$(MAKE) verify-gen

.PHONY: verify-modules
verify-modules: modules
@if !(git diff --quiet HEAD -- go.sum go.mod hack/tools/go.mod hack/tools/go.sum); then \
@if !(git diff HEAD -- go.sum go.mod hack/tools/go.mod hack/tools/go.sum); then \
echo "go module files are out of date"; exit 1; \
fi

.PHONY: verify-gen
verify-gen: generate
@if !(git diff --quiet HEAD); then \
@if !(git diff HEAD); then \
echo "generated files are out of date, run make generate"; exit 1; \
fi

Expand Down
26 changes: 0 additions & 26 deletions bootstrap/kubeadm/.gitignore

This file was deleted.

21 changes: 0 additions & 21 deletions bootstrap/kubeadm/.golangci.yml

This file was deleted.

45 changes: 0 additions & 45 deletions bootstrap/kubeadm/Dockerfile

This file was deleted.

46 changes: 0 additions & 46 deletions bootstrap/kubeadm/Dockerfile.dev

This file was deleted.

201 changes: 0 additions & 201 deletions bootstrap/kubeadm/LICENSE

This file was deleted.

Loading

0 comments on commit 1ef1f78

Please sign in to comment.