Skip to content

Commit 8f14c90

Browse files
committed
chore(manifests): remove manifests as now helm install works + make deploy for development needs
1 parent 2af939e commit 8f14c90

6 files changed

Lines changed: 15 additions & 158 deletions

File tree

Makefile

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -26,37 +26,9 @@ build: docker-build
2626
docker-build: check-docker
2727
docker build --rm -t $(IMAGE) rootfs
2828

29-
docker-push: update-manifests
29+
docker-push:
3030
docker push ${IMAGE}
3131

32-
kube-delete:
33-
-kubectl delete service deis-workflow
34-
-kubectl delete rc deis-workflow
35-
36-
kube-delete-database:
37-
-kubectl delete service deis-database
38-
-kubectl delete rc deis-database
39-
40-
kube-delete-all: kube-delete kube-delete-database
41-
42-
kube-create: update-manifests
43-
kubectl create -f manifests/deis-workflow-service.yml
44-
kubectl create -f manifests/deis-workflow-rc.tmp.yml
45-
46-
kube-create-database:
47-
kubectl create -f manifests/deis-database-rc.yml
48-
kubectl create -f manifests/deis-database-service.yml
49-
50-
kube-create-all: kube-create-database kube-create
51-
52-
kube-update: update-manifests
53-
kubectl delete -f manifests/deis-workflow-rc.tmp.yml
54-
kubectl create -f manifests/deis-workflow-rc.tmp.yml
55-
56-
update-manifests:
57-
sed 's#\(image:\) .*#\1 $(IMAGE)#' manifests/deis-workflow-rc.yml \
58-
> manifests/deis-workflow-rc.tmp.yml
59-
6032
deploy: docker-build docker-push
6133
sed 's#\(image:\) .*#\1 $(IMAGE)#' /tmp/deis-$(COMPONENT) | kubectl apply --validate=true -f -
6234
kubectl scale rc deis-workflow --replicas 0 --namespace deis

README.md

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,18 @@ $ helm repo add deis https://github.com/deis/charts
3737

3838
Then, install Deis!
3939

40+
To work off the latest stable
41+
4042
```console
4143
$ helm install deis/deis
4244
```
4345

46+
To work off the latest development version
47+
48+
```console
49+
$ helm install deis/deis-dev
50+
```
51+
4452
Complete instructions for installing and managing a Deis cluster are
4553
available at https://github.com/deis/docs-v2
4654

@@ -55,16 +63,18 @@ registry. The `$DEIS_REGISTRY` environment variable must point to a registry acc
5563
Kubernetes cluster. You may need to configure the Docker engines on your Kubernetes nodes to allow
5664
`--insecure-registry 192.168.0.0/16` (or the appropriate address range).
5765

66+
When you want to test changes then commit the changes to your branch and run
67+
5868
```console
59-
$ make docker-build docker-push
69+
$ make deploy
6070
```
6171

62-
You'll want to modify the deis chart to use your custom image, then run `helm install` on the
63-
chart.
72+
This will build the required docker images and push them to the registry that was configured, then update and recreate the Replication Controller.
73+
Give it a bit of time for the changes to go live.
6474

6575
## License
6676

67-
Copyright 2013, 2014, 2015 Engine Yard, Inc.
77+
Copyright 2013, 2014, 2015, 2016 Engine Yard, Inc.
6878

6979
Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at <http://www.apache.org/licenses/LICENSE-2.0>
7080

manifests/deis-database-rc.yml

Lines changed: 0 additions & 25 deletions
This file was deleted.

manifests/deis-database-service.yml

Lines changed: 0 additions & 14 deletions
This file was deleted.

manifests/deis-workflow-rc.yml

Lines changed: 0 additions & 67 deletions
This file was deleted.

manifests/deis-workflow-service.yml

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)