Skip to content

Commit e0547b7

Browse files
committed
Merge pull request #40 from arschles/namespace
fix(deis-builder-rc.yaml,builder): create builder pods in correct namespace
2 parents b86f97f + 4939eab commit e0547b7

2 files changed

Lines changed: 7 additions & 2 deletions

File tree

manifests/deis-builder-rc.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ spec:
2626
# This var needs to be passed so that the minio client (https://github.com/minio/mc) will work in Alpine linux
2727
- name: "DOCKERIMAGE"
2828
value: "1"
29+
- name: POD_NAMESPACE
30+
valueFrom:
31+
fieldRef:
32+
fieldPath: metadata.namespace
2933
volumeMounts:
3034
- name: minio-user
3135
mountPath: /var/run/secrets/object/store

rootfs/etc/confd/templates/builder

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,10 @@ MC_PREFIX="mc -C $CONFIG_DIR --quiet"
129129
$MC_PREFIX config host add "$HTTP_PREFIX://$S3EP" $ACCESS_KEY $ACCESS_SECRET
130130
$MC_PREFIX mb "$HTTP_PREFIX://${S3EP}/git"
131131
$MC_PREFIX cp ${APP_NAME}.tar.gz $TAR_URL
132-
echo "stored tarfile in $TAR_URL"
132+
puts-step "stored tarfile in $TAR_URL"
133133

134-
kubectl create -f /etc/${SLUG_NAME}.yaml
134+
puts-step "creating builder pod in namespace $POD_NAMESPACE"
135+
kubectl --namespace=$POD_NAMESPACE create -f /etc/${SLUG_NAME}.yaml
135136

136137
#check for image creation or slug existence in S3EP
137138

0 commit comments

Comments
 (0)