Skip to content

Commit 4389943

Browse files
authored
Merge pull request #3167 from artsy/mc-jones/refactor-rely-on-image-load-script
refactor: use load-secrets-and-run script from updated docker image
2 parents 5ba5c15 + bcad472 commit 4389943

File tree

2 files changed

+0
-50
lines changed

2 files changed

+0
-50
lines changed

hokusai/production.yml

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -305,10 +305,6 @@ spec:
305305
- name: secrets
306306
mountPath: /secrets
307307
readOnly: true
308-
- name: scripts
309-
mountPath: /usr/local/bin/load_secrets_and_run.sh
310-
subPath: load_secrets_and_run.sh
311-
command: ["/usr/local/bin/load_secrets_and_run.sh"]
312308
args:
313309
- sh
314310
- ./export-db.sh
@@ -327,27 +323,6 @@ spec:
327323
volumes:
328324
- name: secrets
329325
emptyDir: {}
330-
- name: scripts
331-
configMap:
332-
name: positron-scripts
333-
defaultMode: 0755
334-
---
335-
apiVersion: v1
336-
kind: ConfigMap
337-
metadata:
338-
name: positron-scripts
339-
namespace: default
340-
data:
341-
load_secrets_and_run.sh: |
342-
#!/bin/bash
343-
CMD="$@"
344-
if [ ! -z "$SECRETS_FILE" ]
345-
then
346-
echo "SECRETS_FILE env var is defined. Sourcing secrets file..."
347-
source "$SECRETS_FILE"
348-
fi
349-
echo "Running command: $CMD"
350-
$CMD
351326
---
352327
apiVersion: v1
353328
kind: Service

hokusai/staging.yml

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -306,10 +306,6 @@ spec:
306306
- name: secrets
307307
mountPath: /secrets
308308
readOnly: true
309-
- name: scripts
310-
mountPath: /usr/local/bin/load_secrets_and_run.sh
311-
subPath: load_secrets_and_run.sh
312-
command: ["/usr/local/bin/load_secrets_and_run.sh"]
313309
args:
314310
- sh
315311
- ./import-db.sh
@@ -328,27 +324,6 @@ spec:
328324
volumes:
329325
- name: secrets
330326
emptyDir: {}
331-
- name: scripts
332-
configMap:
333-
name: positron-scripts
334-
defaultMode: 0755
335-
---
336-
apiVersion: v1
337-
kind: ConfigMap
338-
metadata:
339-
name: positron-scripts
340-
namespace: default
341-
data:
342-
load_secrets_and_run.sh: |
343-
#!/bin/bash
344-
CMD="$@"
345-
if [ ! -z "$SECRETS_FILE" ]
346-
then
347-
echo "SECRETS_FILE env var is defined. Sourcing secrets file..."
348-
source "$SECRETS_FILE"
349-
fi
350-
echo "Running command: $CMD"
351-
$CMD
352327
---
353328
apiVersion: v1
354329
kind: Service

0 commit comments

Comments
 (0)