From c0b5d78579ad018fb96bb6c0a66b433e5be4198b Mon Sep 17 00:00:00 2001 From: Ace Lee Date: Tue, 6 Nov 2018 13:17:23 +0000 Subject: 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 --- docs/release/configguide/a_b_config_guide.rst | 6 +++--- docs/release/configguide/sdc_config_guide.rst | 28 ++++++++------------------- 2 files changed, 11 insertions(+), 23 deletions(-) (limited to 'docs/release') diff --git a/docs/release/configguide/a_b_config_guide.rst b/docs/release/configguide/a_b_config_guide.rst index 17ffcfd..6a0963f 100644 --- 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 --- 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: -The 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 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)**: -- cgit 1.2.3-korg 11'>11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207