fixes

Makefile

@@ -61,7 +61,7 @@ db-reset: confirm_action db-drop db-setup
 migrate: confirm_action
 	@cd src/storage && diesel migration run
 
-redeploy: deploy-contracts db-reset
+redeploy: confirm_action deploy-contracts db-reset
 
 db-drop: confirm_action
 	@# this is used to clear the produciton db; cannot do `diesel database reset` because we don't own the db

bin/db-setup

@@ -7,4 +7,5 @@ echo DATABASE_URL=$DATABASE_URL
 diesel database setup
 diesel migration run
 
+echo "insert config: CONTRACT_ADDR=$CONTRACT_ADDR"
 psql $DATABASE_URL -c "INSERT INTO server_config (contract_addr) VALUES ('$CONTRACT_ADDR')"

bin/deploy-contracts

@@ -13,7 +13,7 @@ echo yarn deploy
 yarn deploy  | tee ../deploy.log
 cd ..
 
-NEW_CONTRACT=`grep -A999 "Starting migrations" deploy.log | grep -A4 "'FranklinProxy'" | grep "contract address" | grep -oE '0x(.+)' \
+export NEW_CONTRACT=`grep -A999 "Starting migrations" deploy.log | grep -A4 "'FranklinProxy'" | grep "contract address" | grep -oE '0x(.+)' \
 | sed -n "s/0x//p"`
 
 if [ ! -z "$NEW_CONTRACT" ]

bin/kubectl

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+. .setup_env
+
+/usr/local/bin/kubectl "$@"

docs/setup-dev.md

@@ -29,7 +29,7 @@ Edit the lines below and add them to your shell profile file (e.g. `~/.bash_prof
 # Add path here:
 export FRANKLIN_HOME=/path/to/franklin
 
-export PATH=$PATH:$FRANKLIN_HOME/bin
+export PATH=$FRANKLIN_HOME/bin:$PATH
 complete -W "\`grep -oE '^[a-zA-Z0-9_.-]+:([^=]|$)' $FRANKLIN_HOME/Makefile | sed 's/[^a-zA-Z0-9_.-]*$//'\`" franklin
 
 # If you're like me, uncomment:

etc/kube/franklin.yaml

@@ -74,7 +74,6 @@ spec:
           resources:
             requests:
               memory: "1Gi"
-              cpu: "2"
           envFrom:
           - secretRef:
               name: franklin-secret