deis · arschles · Jan 15, 2016
diff --git a/Makefile b/Makefile
@@ -15,12 +15,18 @@ BINDIR := ./rootfs/bin
 DEV_REGISTRY ?= $(docker-machine ip deis):5000
 DEIS_REGISTRY ?= ${DEV_REGISTRY}
 
+ENVTPL_PREFIX := docker run --rm -v ${CURDIR}:/pwd -w /pwd
+ENVTPL_IMAGE := quay.io/arschles/envtpl:0.0.1
+
 IMAGE_PREFIX ?= deis
 
-RC := manifests/deis-${SHORT_NAME}-rc.yaml
-SVC := manifests/deis-${SHORT_NAME}-service.yaml
-ADMIN_SEC := manifests/deis-${SHORT_NAME}-secretAdmin.yaml
-USER_SEC := manifests/deis-${SHORT_NAME}-secretUser.yaml
+NAMESPACE ?= deis
+RC := manifests/deis-${SHORT_NAME}-rc.tpl.yaml
+SVC := manifests/deis-${SHORT_NAME}-service.tpl.yaml
+ADMIN_SEC := manifests/deis-${SHORT_NAME}-secretAdmin.tpl.yaml
+USER_SEC := manifests/deis-${SHORT_NAME}-secretUser.tpl.yaml
+MC_POD := manifests/deis-mc-pod.tpl.yaml
+MC_INTEGRATION_POD := manifests/deis-mc-integration-pod.tpl.yaml
 # note that we are not running minio with ssl turned on. this variable is commented
 # SSL_SEC := manifests/deis-${SHORT_NAME}-secretssl-final.yaml
 IMAGE := ${DEIS_REGISTRY}${IMAGE_PREFIX}/${SHORT_NAME}:${VERSION}
@@ -71,12 +77,12 @@ ssl-cert:
 	docker run --rm -v "${CURDIR}":/pwd -w /pwd golang:1.5.1-alpine go run ./genssl/manifest_replace.go --cert=./genssl/server.cert --key=./genssl/server.key --tpl=./manifests/deis-minio-secretssl-tpl.yaml --out=./manifests/deis-minio-secretssl-final.yaml
 
 kube-rc:
-	kubectl create -f ${RC}
+	${ENVTPL_PREFIX} -e RC_NAMESPACE=${NAMESPACE} -e RC_IMAGE=${IMAGE} ${ENVTPL_IMAGE} envtpl -in=${RC} | kubectl create -f -
 
 # note that we are not running minio with ssl turned on. the ssl related dependency and commands are commented out in this target
 kube-secrets: #ssl-cert
-	kubectl create -f ${ADMIN_SEC}
-	kubectl create -f ${USER_SEC}
+	${ENVTPL_PREFIX} -e SECRET_NAMESPACE=${NAMESPACE} ${ENVTPL_IMAGE} envtpl -in=${ADMIN_SEC} | kubectl create -f -
+	${ENVTPL_PREFIX} -e SECRET_NAMESPACE=${NAMESPACE} ${ENVTPL_IMAGE} envtpl -in=${USER_SEC} | kubectl create -f -
 	# kubectl create -f ${SSL_SEC}
 
 # note that we are not running minio with ssl turned on. the ssl related dependency and commands are commented out in this target
@@ -86,17 +92,17 @@ kube-clean-secrets:
 	# kubectl delete secret minio-ssl
 
 kube-service: kube-secrets
-	- kubectl create -f ${SVC}
-	- kubectl create -f manifests/deis-minio-secretUser.yaml
+	${ENVTPL_PREFIX} -e SVC_NAMESPACE=${NAMESPACE} ${ENVTPL_IMAGE} envtpl -in=${SVC} | kubectl create -f -
+	${ENVTPL_PREFIX} -e SECRET_NAMESPACE=${NAMESPACE} ${ENVTPL_IMAGE} envtpl -in=${USER_SEC} | kubectl create -f -
 
 kube-clean:
-	- kubectl delete rc deis-${SHORT_NAME}-rc
+	kubectl delete rc deis-${SHORT_NAME}-rc
 
 kube-mc:
-	kubectl create -f manifests/deis-mc-pod.yaml
+	${ENVTPL_PREFIX} -e POD_NAMESPACE=${NAMESPACE} -e POD_IMAGE=${MC_IMAGE} ${ENVTPL_IMAGE} envtpl -in=${MC_POD} | kubectl create -f -
 
 kube-mc-integration:
-	kubectl create -f manifests/deis-mc-integration-pod.yaml
+	${ENVTPL_PREFIX} -e POD_NAMESPACE=${NAMESPACE} -e POD_IMAGE=${MC_INTEGRATION_IMAGE} envtpl -in=${MC_INTEGRATION_POD} | kubectl create -f -
 
 # build the minio server
 build-server:

diff --git a/manifests/deis-mc-integration-pod.yaml → manifests/deis-mc-integration-pod.tpl.yaml b/manifests/deis-mc-integration-pod.yaml → manifests/deis-mc-integration-pod.tpl.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Pod
 metadata:
   name: deis-mc-integration
+  namespace: {{.POD_NAMESPACE}}
   labels:
     heritage: deis
     version: 2.0.0-beta
@@ -11,7 +12,7 @@ spec:
   containers:
     - name: mc
       imagePullPolicy: Always
-      image: quay.io/deisci/mc-integration:v2-beta
+      image: {{.POD_IMAGE}}
       command:
         - /bin/integration.sh
       args:

diff --git a/manifests/deis-mc-pod.yaml → manifests/deis-mc-pod.tpl.yaml b/manifests/deis-mc-pod.yaml → manifests/deis-mc-pod.tpl.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Pod
 metadata:
   name: deis-mc
+  namespace: {{.POD_NAMESPACE}}
   labels:
     heritage: deis
     version: 2.0.0-beta
@@ -11,7 +12,7 @@ spec:
   containers:
     - name: mc
       imagePullPolicy: Always
-      image: quay.io/deisci/mc:v2-beta
+      image: {{.POD_IMAGE}}
       command:
         - mc
       args:

diff --git a/manifests/deis-minio-rc.yaml → manifests/deis-minio-rc.tpl.yaml b/manifests/deis-minio-rc.yaml → manifests/deis-minio-rc.tpl.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: ReplicationController
 metadata:
   name: deis-minio
+  namespace: {{.RC_NAMESPACE}}
   labels:
     heritage: deis
     release: 2.0.0-beta
@@ -16,7 +17,7 @@ spec:
     spec:
       containers:
         - name: deis-minio
-          image: quay.io/arschles/minio:devel
+          image: {{.RC_IMAGE}}
           imagePullPolicy: Always
           env:
             - name: HEALTH_SERVER_PORT

diff --git a/manifests/deis-minio-secretAdmin.yaml b/manifests/deis-minio-secretAdmin.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: minio-admin
+  namespace: {{.SECRET_NAMESPACE}}
   heritage: deis
 type: Opaque
 data:

diff --git a/manifests/deis-minio-secretUser.yaml → manifests/deis-minio-secretUser.tpl.yaml b/manifests/deis-minio-secretUser.yaml → manifests/deis-minio-secretUser.tpl.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: minio-user
+  namespace: {{.SECRET_NAMESPACE}}
   heritage: deis
 type: Opaque
 data:

diff --git a/manifests/deis-minio-secretssl-tpl.yaml → manifests/deis-minio-secretssl.tpl.yaml b/manifests/deis-minio-secretssl-tpl.yaml → manifests/deis-minio-secretssl.tpl.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: minio-ssl
+  namespace: {{.SECRET_NAMESPACE}}
   heritage: deis
 type: Opaque
 data:

diff --git a/manifests/deis-minio-service.yaml → manifests/deis-minio-service.tpl.yaml b/manifests/deis-minio-service.yaml → manifests/deis-minio-service.tpl.yaml
@@ -3,6 +3,7 @@ kind: Service
 metadata:
   # Give this a useful name.
   name: deis-minio
+  namespace: {{.SVC_NAMESPACE}}
   labels:
     heritage: deis
     release: 0.0.0