summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Wong <stephen.kf.wong@gmail.com>2018-08-21 07:20:24 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-08-21 07:20:24 +0000
commitc7e0f161092e6affccf50e4faf59d6eef4f4314d (patch)
tree1be1d811953bf598a5ae77e2d5e98522f80f42e8
parente35bd25993a9bce37f17cf4353f0aa97d20e9c13 (diff)
parent893821f0dc127e528cf23863d0a9afbc4089a5a2 (diff)
Merge "upgrade istio to 1.0.0"
-rw-r--r--docker/Dockerfile2
-rwxr-xr-xsamples/scenarios/deploy.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 5cc7323..9351823 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -7,7 +7,7 @@
FROM ubuntu:16.04
LABEL image=opnfv/clover
-ARG ISTIO_VERSION=0.6.0
+ARG ISTIO_VERSION=1.0.0
# GIT repo directory
ENV REPOS_DIR="/home/opnfv/repos"
diff --git a/samples/scenarios/deploy.sh b/samples/scenarios/deploy.sh
index 1ffea37..962bd5a 100755
--- a/samples/scenarios/deploy.sh
+++ b/samples/scenarios/deploy.sh
@@ -15,7 +15,7 @@ cd $CLOVER_BASE_DIR
echo "Deploying Istio manual sidecar injection without TLS authentication"
-kubectl apply -f $ISTIO_BASE_DIR/install/kubernetes/istio.yaml
+kubectl apply -f $ISTIO_BASE_DIR/install/kubernetes/istio-demo.yaml
echo "Deploying Service Delivery Controller sample scenario"