fix(Makefile): update deploy target to use deployments (#424)

Also clean up the makefile in general

Author: Joshua-Anderson

Makefile

@@ -9,13 +9,6 @@ DEV_ENV_WORK_DIR := /go/src/${REPO_PATH}
 DEV_ENV_PREFIX := docker run --rm -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR}
 DEV_ENV_CMD := ${DEV_ENV_PREFIX} ${DEV_ENV_IMAGE}
 
-# Get the component informtation to a tmp location and get replica count
-KUBE := $(shell which kubectl)
-ifdef KUBE
-$(shell kubectl get rc deis-$(SHORT_NAME) --namespace deis -o yaml > /tmp/deis-$(SHORT_NAME))
-DESIRED_REPLICAS=$(shell kubectl get -o template rc/deis-$(SHORT_NAME) --template={{.status.replicas}} --namespace deis)
-endif
-
 # SemVer with build information is defined in the SemVer 2 spec, but Docker
 # doesn't allow +, so we use -.
 BINARY_DEST_DIR := rootfs/usr/bin
@@ -28,9 +21,6 @@ DEIS_REGISTRY ?= ${DEV_REGISTRY}/
 
 GOTEST := go test --race
 
-all:
-	@echo "Use a Makefile to control top-level building of the project."
-
 bootstrap:
 	${DEV_ENV_CMD} glide install
 
@@ -55,21 +45,17 @@ test-unit:
 test-cover:
 	${DEV_ENV_CMD} test-cover.sh
 
-update-changelog:
-	${DEV_ENV_PREFIX} -e RELEASE=${WORKFLOW_RELEASE} ${DEV_ENV_IMAGE} gen-changelog.sh \
-	  | cat - CHANGELOG.md > tmp && mv tmp CHANGELOG.md
-
 docker-build: build
 	docker build --rm -t ${IMAGE} rootfs
 	docker tag ${IMAGE} ${MUTABLE_IMAGE}
 
-# Push to a registry that Kubernetes can access.
-docker-push:
-	docker push ${IMAGE}
+check-kubectl:
+	@if [ -z $$(which kubectl) ]; then \
+		echo "kubectl binary could not be located"; \
+		exit 2; \
+	fi
 
-deploy: docker-build docker-push
-	sed 's#\(image:\) .*#\1 $(IMAGE)#' /tmp/deis-$(SHORT_NAME) | kubectl apply --validate=true -f -
-	kubectl scale rc deis-$(SHORT_NAME) --replicas 0 --namespace deis
-	kubectl scale rc deis-$(SHORT_NAME) --replicas $(DESIRED_REPLICAS) --namespace deis
+deploy: check-kubectl docker-build docker-push
+	kubectl --namespace=deis patch deployment deis-$(SHORT_NAME) --type='json' -p='[{"op": "replace", "path": "/spec/template/spec/containers/0/image", "value":"$(IMAGE)"}]'
 
-.PHONY: all build docker-compile kube-up kube-down deploy
+.PHONY: bootstrap glideup build docker-build test test-style test-unit test-cover deploy