chore(Makefile): Modernize dev/hack deployment

Author: krancour

.gitignore

@@ -1,5 +1,3 @@
-manifests/deis-router-rc.tmp.yaml
-manifests/deis-router-deployment.tmp.yaml
 rootfs/opt/router/sbin/router
 rootfs/opt/router/sbin/router.*
 vendor/

Makefile

@@ -62,21 +62,14 @@ clean: check-docker
 full-clean: check-docker
 	docker images -q ${DEIS_REGISTRY}/${IMAGE_PREFIX}/${SHORT_NAME} | xargs docker rmi -f
 
-dev-release: docker-build docker-push set-image
-
-set-image:
-	sed "s#\(image:\) .*#\1 ${IMAGE}#" manifests/deis-${SHORT_NAME}-deployment.yaml > manifests/deis-${SHORT_NAME}-deployment.tmp.yaml
-
-deploy: check-kubectl dev-release
-	@kubectl describe deployment deis-${SHORT_NAME} --namespace=deis >/dev/null 2>&1; \
-	if [ $$? -eq 0 ]; then \
-		kubectl apply -f manifests/deis-${SHORT_NAME}-deployment.tmp.yaml; \
-	else \
-		kubectl create -f manifests/deis-${SHORT_NAME}-deployment.tmp.yaml; \
-	fi
-
-examples:
-	kubectl create -f manifests/examples.yaml
+deploy: check-kubectl docker-build docker-push
+	kubectl --namespace=deis patch deployment deis-${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"} \
+		]'
 
 test: test-style test-unit test-functional
 

charts/examples/Chart.yaml

@@ -0,0 +1,7 @@
+name: examples
+home: https://github.com/deis/router
+version: <Will be populated by the ci before publishing the chart>
+description: Standalone examples for Deis Router.
+maintainers:
+  - name: Deis Team
+    email: engineering@deis.com

charts/examples/templates/apache-deployment.yaml

@@ -0,0 +1,19 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: apache
+  labels:
+    app: apache
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: apache
+  template:
+    metadata:
+      labels:
+        app: apache
+    spec:
+      containers:
+      - name: apache
+        image: httpd

charts/examples/templates/apache-service.yaml

@@ -0,0 +1,17 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: apache
+  labels:
+    router.deis.io/routable: "true"
+    app: apache
+  annotations:
+    # Demonstrates a subdomain of the router's default domain as well as a fully-qualified domain name
+    router.deis.io/domains: apache,httpd.example.com
+spec:
+  ports:
+  - port: 80
+    protocol: TCP
+    targetPort: 80
+  selector:
+    app: apache

charts/examples/templates/nginx-deployment.yaml

@@ -0,0 +1,19 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: nginx
+  labels:
+    app: nginx
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: nginx
+  template:
+    metadata:
+      labels:
+        app: nginx
+    spec:
+      containers:
+      - name: nginx
+        image: nginx

charts/examples/templates/nginx-service.yaml

@@ -0,0 +1,16 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: nginx
+  labels:
+    router.deis.io/routable: "true"
+    app: nginx
+  annotations:
+    router.deis.io/domains: nginx
+spec:
+  ports:
+  - port: 80
+    protocol: TCP
+    targetPort: 80
+  selector:
+    app: nginx