Skip to content

fix(Makefile): enumerate both the admin and user secrets #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
arschles merged 2 commits into from
Dec 8, 2015
Merged

fix(Makefile): enumerate both the admin and user secrets #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4ab56d9
fix(Makefile): enumerate both the admin and user secrets
arschles Dec 7, 2015
3580d9a
chore(deis-minio-rc.yaml,deis-minio-service.yaml): remove errant comm…
arschles Dec 7, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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}
Expand Down
1 change: 0 additions & 1 deletion manifests/deis-minio-rc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ spec:
template:
metadata:
labels:
# Important: these labels need to match the selector above
app: deis-minio
spec:
containers:
Expand Down
1 change: 0 additions & 1 deletion manifests/deis-minio-service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,4 @@ spec:
name: s3
protocol: TCP
selector:
# Match the selector in the RC
app: deis-minio