Merge pull request #319 from krancour/elim-legacy-manifests

Eliminate legacy manifests and update hack / deploy process

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
 

README.md

@@ -29,28 +29,25 @@ This section documents simple procedures for installing the Deis Router for eval
 
 Deis Router can be installed with or without the rest of the Deis Workflow platform.  In either case, begin with a healthy Kubernetes cluster.  Kubernetes getting started documentation is available [here](http://kubernetes.io/gettingstarted/).
 
-Next, install the [Helm Classic](http://helm.sh) package manager, then use the commands below to initialize that tool and load the [deis/charts](https://github.com/deis/charts) repository.
+Next, install the [Helm](http://helm.sh) package manager, then use the commands below to initialize that tool and install all of Deis Workflow or the Deis Router by itself.
 
 ```
-$ helmc update
-$ helmc repo add deis https://github.com/deis/charts
+$ helm init
 ```
 
-To install the router:
+To install all of Deis Workflow:
 
 ```
-$ helmc fetch deis/<chart>
-$ helmc generate -x manifests <chart>
-$ helmc install <chart>
+$ helm repo add workflow https://charts.deis.com/workflow
+$ helm install workflow/workflow --namespace deis
 ```
-Where `<chart>` is selected from the options below:
 
-| Chart | Description |
-|-------|-------------|
-| workflow-rc2 | Install the router along with the rest of the latest stable Deis Workflow release. |
-| workflow-dev | Install the router from master with the rest of the edge Deis Workflow platform. |
-| router-dev | Install the router from master with its minimal set of dependencies. |
+Or to install the Deis Router by itself:
 
+```
+$ helm repo add router https://charts.deis.com/router
+$ helm install router/router --namespace deis
+```
 
 For next steps, skip ahead to the [How it Works](#how-it-works) and [Configuration Guide](#configuration) sections.
 
@@ -98,15 +95,13 @@ $ make build
 
 Make sure to have defined the variable `DEIS_REGISTRY` previous to this step, as your image tags will be prefixed according to this.
 
-Built images will be tagged with the sha of the latest git commit.  __This means that for a new image to have its own unique tag, experimental changes should be committed _before_ building.  Do this in a branch.  Commits can be squashed later when you are done hacking.__
-
 #### To deploy:
 
 ```
 $ make deploy
 ```
 
-The deploy target will implicitly build first, then push the built image (which has its own unique tags) to your development registry (i.e. that specified by `DEIS_REGISTRY`).  A Kubernetes manifest is prepared, referencing the uniquely tagged image, and that manifest is submitted to your Kubernetes cluster.  If a router component is already running in your Kubernetes cluster, it will be deleted and replaced with your build.
+The deploy target will implicitly build first, then push the built image to your development registry (i.e. that specified by `DEIS_REGISTRY`).  The router's _existing_ Kubernetes `Deployment` (installed via Helm) will be updated to use the newly built image.
 
 To see that the router is running, you can look for its pod(s):
 
@@ -119,7 +114,7 @@ $ kubectl get pods --namespace=deis
 To deploy some sample routable applications:
 
 ```
-$ make examples
+$ helm install charts/examples --namespace router-examples
 ```
 
 This will deploy Nginx and Apache to your Kubernetes cluster as if they were user applications.
@@ -152,7 +147,7 @@ metadata:
   name: foo
   labels:
   	router.deis.io/routable: "true"
-  namespace: examples
+  namespace: router-examples
   annotations:
     router.deis.io/domains: www.foobar.com
   spec:
@@ -318,7 +313,7 @@ metadata:
   name: foo
   labels:
   	router.deis.io/routable: "true"
-  namespace: examples
+  namespace: router-examples
   # ...
   annotations:
     router.deis.io/domains: foo,bar,www.foobar.com

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