Use shell mode in run scripts (#383)

* run: update run scripts to use akash cmd

Signed-off-by: Greg Osuri <me@gregosuri.com>

Author: gosuri

_run/multi/akash-provider/run.sh

@@ -27,11 +27,14 @@ masterKey="$AKASH_DATA/master.key"
 providerKey="$AKASH_DATA/provider.key"
 
 if [ ! -s "$masterKey" ] || [ ! -s "$providerKey" ]; then
-  ./akash key create master > "$masterKey"
-  echo "created account: " $(cat "$masterKey")
-
-  ./akash provider create /config/provider.yml -k master > "$providerKey"
-  echo "created provider: " $(cat "$providerKey")
+	eval $(./akash key create master -m shell)
+	echo $akash_create_key_0_public_key > "$masterKey"
+  echo "created master key: " $(cat "$masterKey")
+
+  echo "adding provider"
+  eval $(./akash provider create /config/provider.yml -k master -m shell)
+  echo $akash_add_provider_0_data > "$providerKey"
+  echo "added provider: " $(cat "$providerKey")
 fi
 
 echo "running provider $(cat "$providerKey")..."

_run/multi/deployment.yml

@@ -8,9 +8,8 @@ services:
       - port: 80
         as: 80
         accept:
-          - hello.192.168.99.100.nip.io
-          - hello.192.168.99.101.nip.io
-          - hello.192.168.99.127.nip.io
+          - hello.192.168.99.132.nip.io
+          - hello.192.168.99.130.nip.io
         to:
           - global: true
 

_run/multi/deployments/global.yml

@@ -0,0 +1,31 @@
+---
+version: "1.0"
+
+services:
+  web:
+    image: quay.io/ovrclk/demo-app
+    expose:
+      - port: 80
+        as: 80
+        accept:
+          - hello.192.168.99.132.nip.io
+          - hello.192.168.99.130.nip.io
+        to:
+          - global: true
+
+profiles:
+  compute:
+    web:
+      cpu: "0.25"
+      memory: "128Mi"
+      disk: "1Gi"
+  placement:
+    global:
+      pricing:
+        web: 100u
+
+deployment:
+  web:
+    global:
+      profile: web
+      count: 2

_run/multi/deployments/simple.yml

@@ -0,0 +1,33 @@
+---
+version: "1.0"
+
+services:
+  web:
+    image: quay.io/ovrclk/demo-app
+    expose:
+      - port: 80
+        as: 80
+        accept:
+          - hello.192.168.99.132.nip.io
+          - hello.192.168.99.130.nip.io
+        to:
+          - global: true
+
+profiles:
+  compute:
+    web:
+      cpu: "0.25"
+      memory: "128Mi"
+      disk: "1Gi"
+  placement:
+    westcoast:
+      attributes:
+        region: us-west
+      pricing:
+        web: 100u
+
+deployment:
+  web:
+    westcoast:
+      profile: web
+      count: 2

_run/multi/run.sh

@@ -33,10 +33,11 @@ case "$1" in
     akash deployment create deployment.yml -k master
     ;;
   minikube-start)
-    minikube start --cpus 4 --memory 4096 --kubernetes-version v1.12.2
+    minikube start --cpus 4 --memory 4096 --kubernetes-version v1.15.4
     minikube addons enable ingress
     minikube addons enable metrics-server
     kubectl create -f rbac.yml
+    helm init
     ;;
   *)
     echo "USAGE: $0 <init|send|query|marketplace|deploy|minikube-start>" >&2

_run/single/run.sh

@@ -8,10 +8,16 @@ do_init() {
   mkdir -p "$AKASH_DIR"
   mkdir -p "$AKASHD_DIR"
 
-  eval $(akash key create master -m text); echo $PUBLIC_KEY_ADDRESS > "$DATA_ROOT/master.key"
-  eval $(akash key create other -m text); echo $PUBLIC_KEY_ADDRESS > "$DATA_ROOT/other.key"
+	eval $(akash key create master -m shell)
+	echo $akash_create_key_0_public_key > "$DATA_ROOT/master.key"
+
+	eval $(akash key create other -m shell)
+	echo $akash_create_key_0_public_key > "$DATA_ROOT/other.key"
+
+	eval $(akash_provider key create master -m shell)
+	echo $akash_create_key_0_public_key > "$DATA_ROOT/provider/master.key"
+
   akashd init "$(cat "$DATA_ROOT/master.key")"
-  eval $(akash_provider key create master -m text); echo $PUBLIC_KEY_ADDRESS > "$DATA_ROOT/provider-master.key"
 }
 
 case "$1" in
@@ -33,7 +39,8 @@ case "$1" in
     ;;
   provider)
     [ -f "$DATA_ROOT/master.dc" ] ||
-      akash_provider provider create provider.yml -k master > "$DATA_ROOT/master.dc"
+      eval $(akash_provider provider create provider.yml -k master -m shell) \
+      && echo $akash_add_provider_0_data > "$DATA_ROOT/master.dc"
     akash_provider provider run "$(cat "$DATA_ROOT/master.dc")" -k master
     ;;
   deploy)

cmd/akash/provider.go

@@ -163,9 +163,11 @@ func doProviderRunCommand(session session.Session, cmd *cobra.Command, args []st
 	if err != nil {
 		return err
 	}
+	session.Mode().Printer().Log().WithModule("provider").Info(fmt.Sprintf("Running Provider %v", args[0]))
 
 	pobj, err := session.QueryClient().Provider(session.Ctx(), key.ID())
 	if err != nil {
+		session.Mode().Printer().Log().WithModule("provider").Error(fmt.Sprintf("Unable to query with key %v", args[0]))
 		return err
 	}