Merge pull request #92 from jchauncey/makefile

ref(makefile): Update makefile to work with new chart structure

Author: Jonathan Chauncey

Makefile

@@ -7,26 +7,19 @@ include versioning.mk
 
 build: docker-build
 push: docker-push
-install: kube-install
-uninstall: kube-delete
-upgrade: kube-update
 
 docker-build:
 	docker build ${DOCKER_BUILD_FLAGS} -t ${IMAGE} rootfs
 	docker tag ${IMAGE} ${MUTABLE_IMAGE}
 
-kube-delete:
-	-kubectl delete -f manifests/deis-logger-fluentd-daemon.tmp.yaml
-
-kube-install: update-manifests
-	kubectl create -f manifests/deis-logger-fluentd-daemon.tmp.yaml
+test: docker-build
+	docker run ${IMAGE} /bin/bash -c "cd /opt/fluentd/deis-output && rake test"
 
-kube-update: update-manifests
-	kubectl delete -f manifests/deis-logger-fluentd-daemon.tmp.yaml
-	kubectl create -f manifests/deis-logger-fluentd-daemon.tmp.yaml
+install:
+	helm upgrade fluentd charts/fluentd --install --namespace deis --set org=${IMAGE_PREFIX},docker_tag=${VERSION}
 
-update-manifests:
-	sed 's#\(image:\) .*#\1 $(IMAGE)#' manifests/deis-logger-fluentd-daemon.yaml > manifests/deis-logger-fluentd-daemon.tmp.yaml
+upgrade:
+	helm upgrade fluentd charts/fluentd --namespace deis --set org=${IMAGE_PREFIX},docker_tag=${VERSION}
 
-test: docker-build
-	docker run ${IMAGE} /bin/bash -c "cd /opt/fluentd/deis-output && rake test"
+uninstall:
+	helm delete fluentd --purge