demo: Fixes (#1627)

openservicemesh · Oct 9, 2020 · 10a8cc3 · 10a8cc3
1 parent 5975f2a
commit 10a8cc3
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 13 deletions.
diff --git a/demo/deploy-smi-policies.sh b/demo/deploy-smi-policies.sh
@@ -20,6 +20,6 @@ metadata:
   namespace: $K8S_NAMESPACE
 
 data:
-  permissive_traffic_policy_mode: false
+  permissive_traffic_policy_mode: "false"
 
 EOF
diff --git a/demo/reset-counters.sh b/demo/reset-counters.sh
@@ -12,5 +12,9 @@ curl -I -X GET http://localhost:8081/reset &
 curl -I -X GET http://localhost:8082/reset &
 curl -I -X GET http://localhost:8083/reset &
 
-wait
+# Restart these pods to reset their data stores.
+kubectl rollout restart deployment -n osm-system jaeger &
+kubectl rollout restart deployment -n osm-system osm-grafana &
+kubectl rollout restart deployment -n osm-system osm-prometheus &
 
+wait
diff --git a/demo/reset.sh b/demo/reset.sh
@@ -13,9 +13,9 @@ set -aueo pipefail
 source .env
 
 
-./demo/deploy-smi-policies.sh # Add SMI policies
-./demo/unjoin-namespaces.sh   # Remove namespaces from OSM.
-./demo/reset-counters.sh      # Reset counters
+./demo/deploy-smi-policies.sh     # Add SMI policies
+./demo/unjoin-namespaces.sh       # Remove namespaces from OSM.
+./demo/reset-counters.sh          # Reset counters
 
 
 # Restart these pods to reset their data stores.

diff --git a/scripts/port-forward-bookbuyer-ui.sh b/scripts/port-forward-bookbuyer-ui.sh
@@ -10,6 +10,4 @@ source .env
 BOOKBUYER_LOCAL_PORT="${BOOKBUYER_LOCAL_PORT:-8080}"
 POD="$(kubectl get pods --selector app=bookbuyer -n "$BOOKBUYER_NAMESPACE" --no-headers | grep 'Running' | awk '{print $1}')"
 
-kubectl describe pod "$POD" -n "$BOOKBUYER_NAMESPACE"
-
 kubectl port-forward "$POD" -n "$BOOKBUYER_NAMESPACE" "$BOOKBUYER_LOCAL_PORT":80
diff --git a/scripts/port-forward-bookstore-ui-v1.sh b/scripts/port-forward-bookstore-ui-v1.sh
@@ -18,6 +18,4 @@ fi
 BOOKSTOREv1_LOCAL_PORT="${BOOKSTOREv1_LOCAL_PORT:-8081}"
 POD="$(kubectl get pods --selector app="$backend" -n "$BOOKSTORE_NAMESPACE" --no-headers | grep 'Running' | awk '{print $1}')"
 
-kubectl describe pod "$POD" -n "$BOOKSTORE_NAMESPACE"
-
 kubectl port-forward "$POD" -n "$BOOKSTORE_NAMESPACE" "$BOOKSTOREv1_LOCAL_PORT":80
diff --git a/scripts/port-forward-bookstore-ui-v2.sh b/scripts/port-forward-bookstore-ui-v2.sh
@@ -18,6 +18,4 @@ fi
 BOOKSTOREv2_LOCAL_PORT="${BOOKSTOREv2_LOCAL_PORT:-8082}"
 POD="$(kubectl get pods --selector app="$backend" -n "$BOOKSTORE_NAMESPACE" --no-headers | grep 'Running' | awk '{print $1}')"
 
-kubectl describe pod "$POD" -n "$BOOKSTORE_NAMESPACE"
-
 kubectl port-forward "$POD" -n "$BOOKSTORE_NAMESPACE" "$BOOKSTOREv2_LOCAL_PORT":80
diff --git a/scripts/port-forward-bookthief-ui.sh b/scripts/port-forward-bookthief-ui.sh
@@ -10,6 +10,4 @@ source .env
 BOOKTHIEF_LOCAL_PORT="${BOOKTHIEF_LOCAL_PORT:-8083}"
 POD="$(kubectl get pods --selector app=bookthief -n "$BOOKTHIEF_NAMESPACE" --no-headers | grep 'Running' | awk '{print $1}')"
 
-kubectl describe pod "$POD" -n "$BOOKTHIEF_NAMESPACE"
-
 kubectl port-forward "$POD" -n "$BOOKTHIEF_NAMESPACE" "$BOOKTHIEF_LOCAL_PORT":80