From 4ab56d9079bbc9f7cc0a43acbcd3a6be2ff282bd Mon Sep 17 00:00:00 2001
From: Aaron Schlesinger <arschles@gmail.com>
Date: Mon, 7 Dec 2015 12:07:44 -0800
Subject: [PATCH 1/2] fix(Makefile): enumerate both the admin and user secrets

also removing trailing slash from DEIS_REGISTRY usage
---
 Makefile | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 127ee52..3aaad00 100644
--- a/Makefile
+++ b/Makefile
@@ -12,8 +12,9 @@ DEIS_REGISTRY ?= ${DEV_REGISTRY}
 
 RC := manifests/deis-${SHORT_NAME}-rc.yaml
 SVC := manifests/deis-${SHORT_NAME}-service.yaml
-SEC := manifests/deis-${SHORT_NAME}-secretAdmin.yaml
-IMAGE := ${DEIS_REGISTRY}/${IMAGE_PREFIX}/${SHORT_NAME}:${VERSION}
+ADMIN_SEC := manifests/deis-${SHORT_NAME}-secretAdmin.yaml
+USER_SEC := manifests/deis-${SHORT_NAME}-secretUser.yaml
+IMAGE := ${DEIS_REGISTRY}${SHORT_NAME}:${VERSION}
 
 all: build docker-build docker-push
 
@@ -44,12 +45,8 @@ kube-rc: kube-service
 	kubectl create -f ${RC}
 
 kube-secrets:
-	- kubectl create -f ${SEC}
-
-secrets:
-	perl -pi -e "s|access-key-id: .+|access-key-id: ${key}|g" ${SEC}
-	perl -pi -e "s|access-secret-key: .+|access-secret-key: ${secret}|g" ${SEC}
-	echo ${key} ${secret}
+	kubectl create -f ${ADMIN_SEC}
+	kubectl create -f ${USER_SEC}
 
 kube-service: kube-secrets
 	- kubectl create -f ${SVC}

From 3580d9aadf430ecfae9b58f2c9026d219f6aa4a8 Mon Sep 17 00:00:00 2001
From: Aaron Schlesinger <arschles@gmail.com>
Date: Mon, 7 Dec 2015 12:23:41 -0800
Subject: [PATCH 2/2] chore(deis-minio-rc.yaml,deis-minio-service.yaml): remove
 errant comments

---
 manifests/deis-minio-rc.yaml      | 1 -
 manifests/deis-minio-service.yaml | 1 -
 2 files changed, 2 deletions(-)

diff --git a/manifests/deis-minio-rc.yaml b/manifests/deis-minio-rc.yaml
index 4ab1da3..b50d506 100644
--- a/manifests/deis-minio-rc.yaml
+++ b/manifests/deis-minio-rc.yaml
@@ -12,7 +12,6 @@ spec:
   template:
     metadata:
       labels:
-        # Important: these labels need to match the selector above
         app: deis-minio
     spec:
       containers:
diff --git a/manifests/deis-minio-service.yaml b/manifests/deis-minio-service.yaml
index 587aa0e..667e38c 100644
--- a/manifests/deis-minio-service.yaml
+++ b/manifests/deis-minio-service.yaml
@@ -13,5 +13,4 @@ spec:
       name: s3
       protocol: TCP
   selector:
-    # Match the selector in the RC
     app: deis-minio