feat(Makefile): add kube service targets

Author: mboersma

.gitignore

@@ -26,6 +26,7 @@ client/makeself/
 docs/_build/
 docs/docs.zip
 docs/dummy.sqlite3
+manifests/*.tmp
 
 # coverage reports
 .coverage

Makefile

@@ -2,9 +2,10 @@ ifndef BUILD_TAG
   BUILD_TAG = git-$(shell git rev-parse --short HEAD)
 endif
 
-COMPONENT = workflow
-IMAGE = $(IMAGE_PREFIX)$(COMPONENT):$(BUILD_TAG)
-SHELL_SCRIPTS = $(wildcard rootfs/bin/*) $(shell find "rootfs" -name '*.sh')
+COMPONENT=workflow
+IMAGE_PREFIX ?= $(DEV_REGISTRY)/deis/
+IMAGE=$(IMAGE_PREFIX)$(COMPONENT):$(BUILD_TAG)
+SHELL_SCRIPTS=$(wildcard rootfs/bin/*) $(shell find "rootfs" -name '*.sh')
 
 check-docker:
 	@if [ -z $$(which docker) ]; then \
@@ -17,9 +18,33 @@ build: docker-build
 docker-build: check-docker
 	docker build --rm -t $(IMAGE) rootfs
 
-docker-push:
+docker-push: update-manifests
 	docker push ${IMAGE}
 
+kube-delete:
+	-kubectl delete service deis-workflow
+	-kubectl delete rc deis-workflow
+
+kube-delete-database:
+	-kubectl delete service deis-database
+	-kubectl delete rc deis-database
+
+kube-delete-all: kube-delete kube-delete-database
+
+kube-create:
+	kubectl create -f manifests/deis-workflow-rc.yml.tmp
+	kubectl create -f manifests/deis-workflow-service.yml
+
+kube-create-database:
+	kubectl create -f manifests/deis-database-rc.yml
+	kubectl create -f manifests/deis-database-service.yml
+
+kube-create-all: kube-create-database kube-create
+
+update-manifests:
+	sed 's#\(image:\) .*#\1 $(IMAGE)#' manifests/deis-workflow-rc.yml \
+		> manifests/deis-workflow-rc.yml.tmp
+
 clean: check-docker
 	docker rmi $(IMAGE)
 
@@ -41,15 +66,18 @@ setup-venv:
 	@if [ ! -d venv ]; then virtualenv venv; fi
 	venv/bin/pip install --disable-pip-version-check -q -r rootfs/requirements.txt -r rootfs/dev_requirements.txt
 
-test: test-style test-unit
+test: test-style test-unit test-functional
+
+test-style:
+	cd rootfs && flake8 --show-pep8 --show-source
+	shellcheck $(SHELL_SCRIPTS)
 
 test-unit:
 	cd rootfs \
 		&& coverage run manage.py test --noinput web registry api \
 		&& coverage report -m
 
-test-style:
-	cd rootfs && flake8 --show-pep8 --show-source
-	shellcheck $(SHELL_SCRIPTS)
+test-functional:
+	@echo "Implement functional tests in _tests directory"
 
-.PHONY: build clean commit-hook full-clean postgres setup-venv test test-unit test-style
+.PHONY: build clean commit-hook full-clean postgres setup-venv test test-style test-unit test-functional

README.md

@@ -10,6 +10,55 @@ Deis (pronounced DAY-iss) is an open source PaaS that makes it easy to deploy an
 
 Deis Workflow v2 is changing quickly. Your feedback and participation are more than welcome, but be aware that this project is considered a work in progress.
 
+## Hacking Workflow
+
+First, install [deis/etcd](https://github.com/deis/etcd) as described in its documentation. Ensure that the deis-etcd-service is running and healthy by accessing its port 4001 and seeing that the environment variable `DEIS_ETCD_1_SERVICE_HOST` is set.
+
+One way to test this by running commands from another pod in the same namespace:
+
+```console
+$ kubectl exec alpine -- env | grep DEIS_ETCD_1_SERVICE | sort
+DEIS_ETCD_1_SERVICE_HOST=10.247.187.217
+DEIS_ETCD_1_SERVICE_PORT=2380
+DEIS_ETCD_1_SERVICE_PORT_CLIENT=4100
+DEIS_ETCD_1_SERVICE_PORT_PEER=2380
+$ kubectl exec alpine -- curl -sS 10.247.187.217:4100/version
+{"etcdserver":"2.2.1","etcdcluster":"2.2.0"}
+```
+
+Next build the deis/workflow image and push it to a Docker registry. The `$DEV_REGISTRY` environment variable must point to a registry accessible to your Kubernetes cluster. You may need to configure the Docker engines on your Kubernetes nodes to allow `--insecure-registry 192.168.0.0/16` (or the appropriate address range).
+
+```console
+$ make docker-build docker-push
+```
+
+Finally create a PostgreSQL database and the Deis workflow service:
+```console
+$ make kube-create-all
+kubectl create -f manifests/deis-database-rc.yml
+replicationcontrollers/deis-database
+kubectl create -f manifests/deis-database-service.yml
+services/deis-database
+kubectl create -f manifests/deis-workflow-rc.yml.tmp
+replicationcontrollers/deis-workflow
+kubectl create -f manifests/deis-workflow-service.yml
+services/deis-workflow
+$ kubectl get pod
+NAME                        READY     STATUS    RESTARTS   AGE
+deis-database-34ch4         1/1       Running   0          12m
+deis-etcd-1-140w7           1/1       Running   2          1h
+deis-etcd-1-3jib8           1/1       Running   2          1h
+deis-etcd-1-qf9ab           1/1       Running   2          1h
+deis-etcd-discovery-dp2kp   1/1       Running   0          1h
+deis-workflow-e8qks         1/1       Running   0          12m
+$ kubectl logs deis-workflow-e8qks
++ export ETCD_PORT=4100
++ ETCD_PORT=4100
++ export ETCD_HOST=10.247.187.217
++ ETCD_HOST=10.247.187.217
+...
+```
+
 ## License
 
 Copyright 2013, 2014, 2015 Engine Yard, Inc.

manifests/deis-workflow-pod.yml

@@ -15,6 +15,9 @@ spec:
     spec:
       containers:
       - name: deis-workflow
-        image: 192.168.99.100:5000/deis/workflow:git-3b9ce13
+        image: deis/workflow:latest
+        env:
+          - name: DEBUG
+            value: "true"
         ports:
           - containerPort: 8000