diff --git a/Makefile b/Makefile index a2142921..cdfec624 100644 --- a/Makefile +++ b/Makefile @@ -139,6 +139,14 @@ test: ## Runs the go tests @echo "+ $@" @RUNNING_TESTS=1 go test -tags "$(BUILDTAGS) cgo" $(PACKAGES_FOR_UNIT_TESTS) +.PHONY: prepare-all-in-one-deploy-file +prepare-all-in-one-deploy-file: ## Prepares all in one deploy file + @echo "+ $@" + cp deploy/service_account.yaml deploy/$(ALL_IN_ONE_DEPLOY_FILE_PREFIX)-$(API_VERSION).yaml + cat deploy/role.yaml >> deploy/$(ALL_IN_ONE_DEPLOY_FILE_PREFIX)-$(API_VERSION).yaml + cat deploy/role_binding.yaml >> deploy/$(ALL_IN_ONE_DEPLOY_FILE_PREFIX)-$(API_VERSION).yaml + cat deploy/operator.yaml >> deploy/$(ALL_IN_ONE_DEPLOY_FILE_PREFIX)-$(API_VERSION).yaml + .PHONY: e2e CURRENT_DIRECTORY := $(shell pwd) e2e: build docker-build ## Runs e2e tests, you can use EXTRA_ARGS @@ -324,7 +332,7 @@ start-minikube: ## Start minikube .PHONY: bump-version BUMP := patch -bump-version: ## Bump the version in the version file. Set BUMP to [ patch | major | minor ] +bump-version: prepare-all-in-one-deploy-file ## Bump the version in the version file. Set BUMP to [ patch | major | minor ] @echo "+ $@" @go get -u github.com/jessfraz/junk/sembump # update sembump tool $(eval NEW_VERSION=$(shell sembump --kind $(BUMP) $(VERSION))) diff --git a/config.env b/config.env index 2e870ae2..274d34e8 100644 --- a/config.env +++ b/config.env @@ -4,7 +4,8 @@ PKG=github.com/jenkinsci/kubernetes-operator DOCKER_ORGANIZATION=virtuslab DOCKER_REGISTRY=jenkins-operator NAMESPACE=default -API_VERSION=jenkins:v1alpha2 +API_VERSION=v1alpha2 MINIKUBE_KUBERNETES_VERSION=v1.12.9 MINIKUBE_DRIVER=virtualbox -ENVIRONMENT=minikube \ No newline at end of file +ENVIRONMENT=minikube +ALL_IN_ONE_DEPLOY_FILE_PREFIX=all-in-one \ No newline at end of file