ref(postgres): rename deployment target to postgres

Author: Matthew

.travis.yml

@@ -16,6 +16,6 @@ script:
   - make test
 deploy:
   provider: script
-  script: _scripts/ci/deploy.sh
+  script: contrib/ci/deploy.sh
   on:
     branch: master

Makefile

@@ -4,7 +4,7 @@ include includes.mk
 # Some uses for short name:
 # - Docker image name
 # - Kubernetes service, rc, pod, secret, volume names
-SHORT_NAME := database
+SHORT_NAME := postgres
 
 BUILD_TAG ?= git-$(shell git rev-parse --short HEAD)
 
@@ -14,8 +14,8 @@ DEIS_REGISTRY ?= ${DEV_REGISTRY}
 IMAGE_PREFIX ?= deis/
 
 # Kubernetes-specific information for RC, Service, and Image.
-RC := manifests/deis-${SHORT_NAME}-rc.tmp.yaml
-SVC := manifests/deis-${SHORT_NAME}-service.yaml
+RC := contrib/kubernetes/manifests/${SHORT_NAME}-rc.tmp.yaml
+SVC := contrib/kubernetes/manifests/${SHORT_NAME}-service.yaml
 IMAGE := ${DEIS_REGISTRY}/${IMAGE_PREFIX}${SHORT_NAME}:${BUILD_TAG}
 
 all:
@@ -46,13 +46,13 @@ kube-rc: check-kubectl
 	kubectl create -f ${RC}
 
 kube-clean: check-kubectl
-	kubectl delete rc deis-example
+	kubectl delete rc ${SHORT_NAME}
 
 test: check-docker
-	./_scripts/ci/test.sh ${IMAGE}
+	contrib/ci/test.sh ${IMAGE}
 
 update-manifests:
-	sed 's#\(image:\) .*#\1 $(IMAGE)#' manifests/deis-database-rc.yaml \
-		> manifests/deis-database-rc.tmp.yaml
+	sed 's#\(image:\) .*#\1 $(IMAGE)#' contrib/kubernetes/manifests/${SHORT_NAME}-rc.yaml \
+		> ${RC}
 
 .PHONY: all build kube-up kube-down deploy

README.md

@@ -1,4 +1,4 @@
-# Deis Database
+# Postgres
 
 A PostgreSQL database for use in the [Deis](http://deis.io) open source PaaS.
 
@@ -12,81 +12,31 @@ Please add any [issues](https://github.com/deis/postgres/issues) you find with t
 
 ## Deploying
 
-In order to run this component in Kubernetes, a few prerequisites are needed:
-
- - An AWS account with S3 enabled
- - An external etcd cluster
- - your own kubernetes cluster
-
-In Deis, these services are provided to you automatically through [the store](http://docs.deis.io/en/latest/understanding_deis/components/#store)
-and [etcd](https://github.com/technosophos/etcd) components.
-
 To build a dev release of this image, you will also need your own registry, but DockerHub or
 [Quay](https://quay.io/) will do fine here. To build, run:
 
 ```bash
-$ make build
-$ docker build -t deis/postgres:v0.0.1 rootfs
-$ docker push deis/postgres:v0.0.1
+$ export DEIS_REGISTRY=myregistry.com:5000
+$ make docker-build docker-push
 ```
 
 This will compile the Docker image and push it to your registry.
 
-Then, you'll need to modify the kubernetes manifests to point to your S3 account and your etcd
-cluster. Open up the replication controller manifest and change the values:
-
-```
-$ git diff
-diff --git a/manifests/postgres-rc.json b/manifests/postgres-rc.json
-index a5cbb23..70d3bc2 100644
---- a/manifests/postgres-rc.json
-+++ b/manifests/postgres-rc.json
-@@ -22,15 +22,15 @@
-         "containers": [
-           {
-             "name": "deis-database",
--            "image": "CHANGEME",
-+            "image": "deis/postgres:v0.0.1",
-             "env": [
-               {
-                 "name" : "AWS_ACCESS_KEY_ID",
--                "value" : "CHANGEME"
-+                "value" : "FOO"
-               },
-               {
-                 "name" : "AWS_SECRET_ACCESS_KEY",
--                "value" : "CHANGEME"
-+                "value" : "BAR"
-               },
-               {
-                 "name" : "WALE_S3_PREFIX",
-@@ -38,7 +38,7 @@
-               },
-               {
-                 "name" : "ETCD_SERVICE_HOST",
--                "value" : "192.168.0.1"
-+                "value" : "10.0.1.100"
-               }
-             ],
-             "ports": [
-```
-
 After that, run
 
 ```
 $ make deploy
 ```
 
-Which will deploy the component to kubernetes. After a while, you should see a few pods up with one
+Which will deploy the component to kubernetes. After a while, you should see one pod up with one
 running:
 
 ```
 NAME                  READY     STATUS    RESTARTS   AGE
 deis-database-6wy8o   1/1       Running   0          32s
-deis-database-rh00d   0/1       Running   0          32s
 ```
 
-You can then query these images as you would with any other Kubernetes pod:
+You can then query this pod as you would with any other Kubernetes pod:
 
 ```
 $ kubectl logs -f deis-database-6wy8o
@@ -96,8 +46,6 @@ $ kubectl exec -it deis-database-6wy8o psql
 
 ## Testing
 
-**Note**: At this time, tests from Deis v1 are still being ported over.
-
 You can run the test suite with
 
 ```

_scripts/ci/deploy.sh contrib/ci/deploy.sh_scripts/ci/deploy.sh renamed to contrib/ci/deploy.sh

@@ -1,24 +1,21 @@
 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: deis-database
+  name: postgres
   labels:
-    app: deis-database
-    heritage: deis
+    app: postgres
 spec:
   replicas: 1
   selector:
-    app: deis-database
-    heritage: deis
+    app: postgres
   template:
     metadata:
       labels:
-        app: deis-database
-        heritage: deis
+        app: postgres
     spec:
       containers:
-        - name: deis-database
-          image: quay.io/deisci/database:v2-alpha
+        - name: postgres
+          image: quay.io/deisci/postgres:v2-alpha
           env:
             - name: POSTGRES_USER
               value: "deis"

_scripts/ci/test.sh contrib/ci/test.sh_scripts/ci/test.sh renamed to contrib/ci/test.sh

@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: postgres
+spec:
+  ports:
+    - port: 5432
+  selector:
+    app: postgres