ref(ci): refactor monitor ci

Consolidate refactored make logic for monitor components into `default.mk`;
Introduce `test` and `test-style` targets for running shellcheck against bash scripts;
Remove deprecated/unused `_scripts` and `manifests` directories

Author: Vaughn Dice

default.mk

@@ -0,0 +1,44 @@
+SHELL := /bin/bash
+
+# all monitor components share/use the following targets/exports
+DOCKER_HOST = $(shell echo $$DOCKER_HOST)
+BUILD_TAG ?= git-$(shell git rev-parse --short HEAD)
+DEIS_REGISTRY ?= ${DEV_REGISTRY}
+IMAGE_PREFIX ?= deis
+
+include ../includes.mk
+include ../versioning.mk
+
+TEST_ENV_PREFIX := docker run --rm -v ${CURDIR}:/bash -w /bash quay.io/deis/shell-dev
+
+build: docker-build
+push: docker-push
+deploy: check-kubectl docker-build docker-push upgrade
+
+docker-build:
+	docker build ${DOCKER_BUILD_FLAGS} -t ${IMAGE} rootfs
+	docker tag ${IMAGE} ${MUTABLE_IMAGE}
+
+clean: check-docker
+	docker rmi $(IMAGE)
+
+KD = kubectl --namespace=deis
+upgrade:
+	${KD} patch ${RESOURCE_TYPE} deis-monitor-${SHORT_NAME} \
+		--type='json' \
+		-p='[ \
+			{"op": "replace", "path": "/spec/strategy", "value":{"type":"Recreate"}}, \
+			{"op": "replace", "path": "/spec/template/spec/containers/0/image", "value":"$(IMAGE)"}, \
+			{"op": "replace", "path": "/spec/template/spec/containers/0/imagePullPolicy", "value":"Always"} \
+		]'
+	@if [ "${RESOURCE_TYPE}" == "daemonset" ]; then \
+		echo "Deleting daemonset pods as they aren't yet recreated when daemonset is patched..."; \
+		${KD} delete $$(${KD} get pod -o name | grep "${SHORT_NAME}"); \
+	fi
+
+test: test-style
+
+test-style:
+	${TEST_ENV_PREFIX} shellcheck $(SHELL_SCRIPTS)
+
+.PHONY: build push docker-build clean upgrade deploy test test-style

grafana/Makefile

@@ -1,37 +1,5 @@
-SHELL = /bin/bash
-
-DOCKER_HOST = $(shell echo $$DOCKER_HOST)
-BUILD_TAG ?= git-$(shell git rev-parse --short HEAD)
 SHORT_NAME ?= grafana
-DEIS_REGISTRY ?= ${DEV_REGISTRY}
-IMAGE_PREFIX ?= deis
-
-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}
-
-clean: check-docker
-	docker rmi $(IMAGE)
-
-update-manifests:
-	sed 's#\(image:\) .*#\1 $(IMAGE)#' manifests/deis-monitor-grafana-deployment.yaml > manifests/deis-monitor-grafana-deployment.tmp.yaml
-
-kube-install: update-manifests
-	kubectl create -f manifests/deis-monitor-grafana-svc.yaml
-	kubectl create -f manifests/deis-monitor-grafana-deployment.tmp.yaml
-
-kube-delete: update-manifests
-	kubectl delete -f manifests/deis-monitor-grafana-svc.yaml
-	kubectl delete -f manifests/deis-monitor-grafana-deployment.tmp.yaml
+RESOURCE_TYPE := deployment
+SHELL_SCRIPTS = rootfs/usr/share/grafana/start-grafana
 
-kube-update: update-manifests
-	kubectl delete -f manifests/deis-monitor-grafana-deployment.tmp.yaml
-	kubectl create -f manifests/deis-monitor-grafana-deployment.tmp.yaml
+include ../default.mk

grafana/README.md

@@ -118,8 +118,6 @@ There are a few key environment variables you should be aware of when interactin
 
 * `make build` - Build docker image
 * `make push` - Push docker image to a registry
-* `make install` - Install all necessary components into kubernetes cluster (does not install telegraf or influx)
-* `make uninstall` - Remove grafana from kubernetes
 * `make upgrade` - Replaces the running grafana instance with a new one
 
 The typical workflow will look something like this - `DEIS_REGISTRY=quay.io/ IMAGE_PREFIX=foouser make build push upgrade`

grafana/_scripts/deploy.sh

@@ -17,7 +17,7 @@ RUN apt-get update && \
     apt-get clean -y && \
     # package up license files if any by appending to existing tar
     COPYRIGHT_TAR='/usr/share/copyrights.tar'; \
-    gunzip $COPYRIGHT_TAR.gz; tar -rf $COPYRIGHT_TAR /usr/share/doc/*/copyright; gzip $COPYRIGHT_TAR && \
+    gunzip -f $COPYRIGHT_TAR.gz; tar -rf $COPYRIGHT_TAR /usr/share/doc/*/copyright; gzip $COPYRIGHT_TAR && \
     rm -rf \
         /usr/share/doc \
         /usr/share/man \

grafana/manifests/deis-monitor-grafana-deployment.yaml

@@ -34,7 +34,7 @@ if [ ! -z "${GF_INSTALL_PLUGINS}" ]; then
   IFS=','
   for plugin in ${GF_INSTALL_PLUGINS}; do
     echo "Installing ${plugin} ..."
-    grafana-cli  --pluginsDir "${GF_PATHS_PLUGINS}" plugins install ${plugin}
+    grafana-cli  --pluginsDir "${GF_PATHS_PLUGINS}" plugins install "${plugin}"
     echo ""
     echo "Done installing ${plugin}"
   done
@@ -45,7 +45,7 @@ set -m
 echo "Starting Grafana in the background"
 exec /usr/sbin/grafana-server -config /usr/share/grafana/grafana.ini -homepath /usr/share/grafana &
 echo "Waiting for Grafana to come up..."
-until $(curl -q --fail --output /dev/null --silent http://${GRAFANA_USER}:${GRAFANA_PASSWD}@localhost:${GRAFANA_PORT}/api/org); do
+until curl -q --fail --output /dev/null --silent "http://${GRAFANA_USER}:${GRAFANA_PASSWD}@localhost:${GRAFANA_PORT}/api/org"; do
   printf "."
   sleep 2
 done

grafana/manifests/deis-monitor-grafana-svc.yaml

@@ -0,0 +1,13 @@
+.PHONY: check-docker
+check-docker:
+	@if [ -z $$(which docker) ]; then \
+		echo "Missing \`docker\` client which is required for development"; \
+		exit 2; \
+	fi
+
+.PHONY: check-kubectl
+check-kubectl:
+	@if [ -z $$(which kubectl) ]; then \
+		echo "Missing \`kubectl\` client which is required for development"; \
+		exit 2; \
+	fi

grafana/rootfs/Dockerfile

@@ -1,39 +1,5 @@
-SHELL = /bin/bash
-
-DOCKER_HOST = $(shell echo $$DOCKER_HOST)
-BUILD_TAG ?= git-$(shell git rev-parse --short HEAD)
 SHORT_NAME ?= influxdb
-DEIS_REGISTRY ?= ${DEV_REGISTRY}
-IMAGE_PREFIX ?= deis
-
-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}
-
-clean: check-docker
-	docker rmi $(IMAGE)
-
-update-manifests:
-	sed 's#\(image:\) .*#\1 $(IMAGE)#' manifests/deis-monitor-influxdb-rc.yaml > manifests/deis-monitor-influxdb-rc.tmp.yaml
-
-kube-install: update-manifests
-	kubectl create -f manifests/deis-monitor-influxdb-api-svc.yaml
-	kubectl create -f manifests/deis-monitor-influxdb-ui-svc.yaml
-	kubectl create -f manifests/deis-monitor-influxdb-rc.tmp.yaml
-
-kube-delete: update-manifests
-	kubectl delete -f manifests/deis-monitor-influxdb-api-svc.yaml
-	kubectl delete -f manifests/deis-monitor-influxdb-ui-svc.yaml
-	kubectl delete -f manifests/deis-monitor-influxdb-rc.tmp.yaml
+RESOURCE_TYPE := deployment
+SHELL_SCRIPTS = rootfs/home/influxdb/start-influx
 
-kube-update: update-manifests
-	kubectl delete -f manifests/deis-monitor-influxdb-rc.tmp.yaml
-	kubectl create -f manifests/deis-monitor-influxdb-rc.tmp.yaml
+include ../default.mk