Merge pull request #1545 from vincepri/batteries-included

✨ Ship CABPK as part of CAPI

.golangci.yml

@@ -18,7 +18,7 @@ issues:
   max-same-issues: 0
   max-issues-per-linter: 0
 run:
-  deadline: 2m
+  deadline: 4m
   skip-files:
     - "zz_generated.*\\.go$"
   skip-dirs:

Makefile

@@ -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.
@@ -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/
@@ -286,7 +292,6 @@ 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