Merge lp:~ricardokirkner/isitdeployable/generic-deployment-infra into lp:isitdeployable

[Ricardo Kirkner]

rely on generic Makefile from ols-k8s project

[Guillermo Gonzalez (verterok)]

I like red!

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2017-11-10 16:19:27 +0000
+++ .bzrignore	2017-11-16 11:28:00 +0000
@@ -1,4 +1,5 @@
 branches/*
+deployment/ols-k8s
 deployment/secrets.yaml
 deployment/tmp/*
 test.db

=== modified file 'deployment/Makefile'
--- deployment/Makefile	2017-11-15 15:42:19 +0000
+++ deployment/Makefile	2017-11-16 11:28:00 +0000
@@ -1,122 +1,17 @@
 IMAGE_NAME ?= isitdeployable
 
+# include generic Makefile
+include ols-k8s/Makefile
+
 # pre-process arguments
-# if the first argument is "special" (logs, describe, shell, bzr-check-lock, bzr-break-lock)...
-ifneq (,$(filter $(firstword $(MAKECMDGOALS)),logs describe shell bzr-check-lock bzr-break-lock))
+# if the first argument is "special" (bzr-check-lock, bzr-break-lock)...
+ifneq (,$(filter $(firstword $(MAKECMDGOALS)),bzr-check-lock bzr-break-lock))
 # use the rest as sub-arguments
 ARGS := $(wordlist 2,$(words $(MAKECMDGOALS)),$(MAKECMDGOALS))
 # ...and turn them into do-nothing targets
 $(eval $(ARGS):;@:)
 endif
 
-.DEFAULT_GOAL := status
-
-.PHONY: help
-help:
-	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) \
-		| cut -d ':' -f 2,3 \
-		| sort \
-		| awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
-
-.PHONY: status
-status:  ## Show cluster status info
-	@$(check-env-vars)
-	@kubectl cluster-info | grep 'Kubernetes master'
-	kubectl -n $(NAMESPACE) get -L revision po,rs,deploy,svc,cm,secrets,ingress
-
-.PHONY: namespace
-namespace: tmp/namespace.yaml  ## Create namespace
-	@$(check-env-vars)
-	kubectl apply -f tmp/namespace.yaml --record
-	kubectl get secret registry-access -o yaml | sed 's/default/$(NAMESPACE)/g' | kubectl -n $(NAMESPACE) apply -f - --record
-
-.PHONY: deploy
-deploy: render-config  ## Deploy stack (from scratch)
-	@$(check-env-vars)
-	@$(check-image-vars)
-	kubectl apply --record \
-		-f tmp/configmaps.yaml \
-		-f secrets.yaml \
-		-f tmp/services.yaml \
-		-f tmp/ingress.yaml
-	$(MAKE) migrate-db
-	kubectl apply --record -f tmp/deployments.yaml
-	kubectl -n $(NAMESPACE) rollout status deployment/app
-	$(MAKE) clean-migrate-db
-
-.PHONY: update-deploy
-update-deploy: FILENAME ?= tmp/deployments.yaml
-update-deploy: render-config  ## Update deployment
-	@$(check-env-vars)
-	@$(check-image-vars)
-	kubectl replace -f $(FILENAME) --record
-	kubectl -n $(NAMESPACE) rollout status deployment/app
-
-.PHONY: update-config
-update-config: tmp/configmaps.yaml  ## Update config options
-	@$(check-env-vars)
-	kubectl replace -f tmp/configmaps.yaml --record
-
-.PHONY: update-secrets
-update-secrets:  ## Update secrets
-	@$(check-env-vars)
-	kubectl replace -f secrets.yaml --record
-
-.PHONY: update-code
-update-code:  ## Update image only
-	@$(check-env-vars)
-	@$(check-image-vars)
-	kubectl -n $(NAMESPACE) set image deployment/app app=$(DOCKER_REGISTRY)/$(IMAGE_NAME):$(IMAGE_TAG) worker=$(DOCKER_REGISTRY)/$(IMAGE_NAME):$(IMAGE_TAG) --record
-	kubectl -n $(NAMESPACE) rollout status deployment/app
-
-.PHONY: migrate-db
-migrate-db: tmp/migrate-db-job.yaml  ## Run schema migrations
-	@$(check-env-vars)
-	kubectl apply -f tmp/migrate-db-job.yaml --record
-	until kubectl -n $(NAMESPACE) get jobs migrate-db -o jsonpath='{.status.conditions[?(@.type=="Complete")].status}' | grep True ; do sleep 1 ; done
-
-.PHONY: clean-migrate-db
-clean-migrate-db: tmp/migrate-db-job.yaml  ## Remove job for schema migrations
-	@$(check-env-vars)
-	kubectl delete -f tmp/migrate-db-job.yaml
-
-.PHONY: release
-release:  ## Cut a new release
-	@$(check-env-vars)
-	@$(check-image-vars)
-	$(MAKE) clean-config
-	$(MAKE) render-config
-	$(MAKE) migrate-db
-	$(MAKE) update-deploy
-	$(MAKE) clean-migrate-db
-
-.PHONY: rollback
-rollback:  ## Undo latest release
-	@$(check-env-vars)
-	kubectl -n $(NAMESPACE) rollout undo deploy/app
-
-.PHONY: logs
-logs:  ## Show logs
-	@$(check-env-vars)
-	kubectl -n $(NAMESPACE) logs $(ARGS)
-
-.PHONY: describe
-describe:  ## Describe pod
-	@$(check-env-vars)
-	kubectl -n $(NAMESPACE) describe $(ARGS)
-
-.PHONY: shell
-shell:  ## Open a shell
-	@$(check-env-vars)
-	kubectl -n $(NAMESPACE) exec -it $(ARGS) bash
-
-.PHONY: render-config
-render-config: $(shell find config -name '*.yaml.tpl' -printf 'tmp/%f\n' | sed -e 's/.tpl//g')  ## Render config from templates
-
-.PHONY: clean-config
-clean-config:  ## Delete rendered config files
-	rm -f tmp/*.yaml
-
 .PHONY: bzr-check-lock
 bzr-check-lock:  ## Check for bzr locks held in place
 	@$(check-env-vars)
@@ -130,47 +25,5 @@
 	@$(check-env-vars)
 	kubectl -n $(NAMESPACE) exec -it $(ARGS) -c worker bash -- -c 'for branch in `find tmp/branches -name .bzr -type d | xargs dirname`; do (cd $${branch}; bzr break-lock); done'
 
-
-# helper targets
-
-tmp/%.yaml: config/%.yaml.tpl
-	$(MAKE) render-template SRC=$< DST=$@
-
-.PHONY: render-template
-render-template:
-	@$(eval REVISION=$(shell docker inspect -f '{{.Config.Labels.revision}}' $(DOCKER_REGISTRY)/$(IMAGE_NAME):$(IMAGE_TAG)))
-	@REVISION=$(REVISION) IMAGE_NAME=$(IMAGE_NAME) IMAGE_TAG=$(IMAGE_TAG) envsubst < $(SRC) > $(DST)
-
-# defines
-
-define check-env-vars
-	if test -z "$(NAMESPACE)"; then \
-		echo "NAMESPACE variable not defined; aborting."; \
-		exit 1; \
-	elif test -z "$(DOMAIN)"; then \
-		echo "DOMAIN variable not defined; aborting."; \
-		exit 1; \
-	elif test -z "$(DB_EXTERNAL_NAME)"; then \
-		echo "DB_EXTERNAL_NAME variable not defined; aborting."; \
-		exit 1; \
-	elif test -z "$(AMQP_EXTERNAL_NAME)"; then \
-		echo "AMQP_EXTERNAL_NAME variable not defined; aborting."; \
-		exit 1; \
-	fi
-endef
-
-define check-image-vars
-	if test -z "$(DOCKER_REGISTRY)"; then \
-		echo "DOCKER_REGISTRY variable not defined; aborting."; \
-		exit 1; \
-	elif test -z "$(IMAGE_NAME)"; then \
-		echo "IMAGE_NAME variable not defined; aborting."; \
-		exit 1; \
-	elif test -z "$(IMAGE_TAG)"; then \
-		echo "IMAGE_TAG variable not defined; aborting."; \
-		exit 1; \
-	fi
-endef
-
 # other makefiles
 include dev.mk

=== modified file 'deployment/README'
--- deployment/README	2017-11-10 18:54:25 +0000
+++ deployment/README	2017-11-16 11:28:00 +0000
@@ -1,44 +1,6 @@
-= Bootstrap Kubernetes cluster
-
-make cluster
-make registry-proxy
-
-= Build image
-
-cd .. && make k8s-build k8s-upload
-
-Take note of the tag applied to the build image. See last line of output, should be
-something along the lines of:
-
-Successfully tagged isitdeployable:trunk-<revno>
-
-Then, from now on use IMAGE_TAG=trunk-<revno>
-
-= Initial deploy
-
-source envrc
-make namespace
-make external-services (for development only)
-make secrets.yaml (for development only)
-
-Wait until the cluster is ready (check using `make status` until all pods are ready).
-Then deploy the app:
-
-make deploy IMAGE_TAG=trunk-<revno>
-
-= Code update
-
-Assuming a new revision is available and an image was built and uploaded for it:
-
-make release IMAGE_TAG=trunk-<revno>
-
-= Config / Secret update
-
-make update-config
-make update-secret
-
-= Redeploy 
-
-You can easily redeploy any revision by just releasing it again:
-
-make release IMAGE_TAG=trunk-<revno>
+= Get started
+
+git clone lp:ols-k8s
+
+The follow README from ols-k8s/README
+