change the doc for the istio 1.0

prometheus has been installed in istio 1.0
so we need to delete the view.sh file.
but we need to change to to NodePort way to expose the port

Change-Id: I8ae6bc1c251ba5effbc94efe984384af6e64adfc
Signed-off-by: Ace Lee <liyin11@huawei.com>

diff --git a/docs/release/configguide/a_b_config_guide.rst b/docs/release/configguide/a_b_config_guide.rst
index 17ffcfd..6a0963f 100644 (file)
--- a/docs/release/configguide/a_b_config_guide.rst
+++ b/docs/release/configguide/a_b_config_guide.rst
@@ -42,8 +42,8 @@ The following assumptions must be met before executing the sample script:
 
 .. code-block:: bash
 
-    $ curl -L https://github.com/istio/istio/releases/download/0.6.0/istio-0.6.0-linux.tar.gz | tar xz
-    $ cd istio-0.6.0
+    $ curl -L https://github.com/istio/istio/releases/download/1.0.0/istio-1.0.0-linux.tar.gz | tar xz
+    $ cd istio-1.0.0
     $ export PATH=$PWD/bin:$PATH
 
 Environment setup
@@ -55,7 +55,7 @@ First setup the environment using the Clover source with the following commands:
 
     $ git clone https://gerrit.opnfv.org/gerrit/clover
     $ cd clover
-    $ git checkout stable/fraser
+    $ git checkout stable/gambia
     $ pip install .
     $ cd clover
 

diff --git a/docs/release/configguide/sdc_config_guide.rst b/docs/release/configguide/sdc_config_guide.rst
index b95b6cf..ea3948c 100644 (file)
--- a/docs/release/configguide/sdc_config_guide.rst
+++ b/docs/release/configguide/sdc_config_guide.rst
@@ -138,32 +138,32 @@ two commands:
 
     $ docker pull opnfv/clover:<release_tag>
 
-The <release_tag> is **opnfv-6.0.0** for the Fraser release. However, the latest
-will be pulled if the tag is unspecified. To deploy the Fraser release use these commands:
+The <release_tag> is **opnfv-7.0.0** for the Gambia release. However, the latest
+will be pulled if the tag is unspecified. To deploy the Gambia release use these commands:
 
 .. code-block:: bash
 
-    $ docker pull opnfv/clover:opnfv-6.0.0
+    $ docker pull opnfv/clover:opnfv-7.0.0
     $ sudo docker run --rm \
     -v ~/.kube/config:/root/.kube/config \
     opnfv/clover \
     /bin/bash -c '/home/opnfv/repos/clover/samples/scenarios/deploy.sh'
 
-The deploy script invoked above begins by installing Istio 0.6.0 into your Kubernetes environment.
+The deploy script invoked above begins by installing Istio 1.0.0 into your Kubernetes environment.
 It proceeds to deploy the entire SDC manifest. If you've chosen to employ this method of
 deployment, you may skip the next section.
 
 Deploy from source
 ------------------
 
-Ensure Istio 0.6.0 is installed, as a prerequisite, using the following commands:
+Ensure Istio 1.0.0 is installed, as a prerequisite, using the following commands:
 
 .. code-block:: bash
 
-    $ curl -L https://github.com/istio/istio/releases/download/0.6.0/istio-0.6.0-linux.tar.gz | tar xz
-    $ cd istio-0.6.0
+    $ curl -L https://github.com/istio/istio/releases/download/1.0.0/istio-1.0.0-linux.tar.gz | tar xz
+    $ cd istio-1.0.0
     $ export PATH=$PWD/bin:$PATH
-    $ kubectl apply -f install/kubernetes/istio.yaml
+    $ kubectl apply -f install/kubernetes/istio-demo.yaml
 
 The above sequence of commands installs Istio with manual sidecar injection without mutual TLS
 authentication between sidecars.
@@ -279,18 +279,6 @@ to inspect the internals of the Istio service mesh.
 Exposing tracing and monitoring
 -------------------------------
 
-To gain insight into the service mesh, the Jaeger tracing and Prometheus monitoring tools
-can also be deployed. These tools can show how the sample functions in the service mesh.
-Using the Clover container, issue the following command to deploy these tools
-into your Kubernetes environment:
-
-.. code-block:: bash
-
-    $ sudo docker run --rm \
-    -v ~/.kube/config:/root/.kube/config \
-    opnfv/clover \
-    /bin/bash -c '/home/opnfv/repos/clover/samples/scenarios/view.sh'
-
 The Jaeger tracing UI is exposed outside of the Kubernetes cluster via any node IP in the cluster
 using the following commands **(above command already executes the two commands below)**:
 

diff --git a/samples/scenarios/view.sh b/samples/scenarios/view.sh
deleted file mode 100755 (executable)
index 8b155ce..0000000
--- a/samples/scenarios/view.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) Authors of Clover
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-
-CLOVER_BASE_DIR=${CLOVER_BASE_DIR:-"/home/opnfv/repos/clover"}
-ISTIO_BASE_DIR=${ISTIO_BASE_DIR:-"/istio-source"}
-
-cd $CLOVER_BASE_DIR
-
-echo "Deploying Prometheus monitoring"
-
-kubectl apply -f $ISTIO_BASE_DIR/install/kubernetes/addons/prometheus.yaml
-
-echo "Deploying Jaeger tracing"
-
-kubectl apply -n istio-system -f https://raw.githubusercontent.com/jaegertracing/jaeger-kubernetes/master/all-in-one/jaeger-all-in-one-template.yml
-
-echo "Exposing tracing and monitoring outside of Kubernetes cluster"
-
-kubectl delete -n istio-system svc prometheus
-
-kubectl expose -n istio-system deployment jaeger-deployment --port=16686 --type=NodePort
-
-kubectl expose -n istio-system deployment prometheus --port=9090 --type=NodePort