Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cloudshell link fix #20

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+16 −20
Open

Cloudshell link fix #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04e038d
update Qwiklabs and Readme instructions
alekhyal Mar 23, 2019
c4d2265
Merge branch 'master' into master
alekhyal Mar 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions README-QWIKLABS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
- [Istio Data Plane](#istio-data-plane)
+ [BookInfo Sample Application](#bookinfo-sample-application)
+ [Putting it All Together](#putting-it-all-together)
* [Run Demo using Cloud Shell](#run-demo-using-cloud-shell)
* [Initialize GCP](#initialize-gcp)
* [Deployment steps](#deployment-steps)
* [Validation](#validation)
Expand Down Expand Up @@ -114,6 +115,14 @@ In the diagram, note:

![](./images/istio-gke.png)

## Run Demo using Cloud Shell

Use the `--recursive` argument to download dependencies provided via a git submodule.

```shell
git submodule update --init --recursive
```

## Initialize GCP

```console
Expand Down
27 changes: 7 additions & 20 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
* [Istio Data Plane](#istio-data-plane)
* [BookInfo Sample Application](#bookinfo-sample-application)
* [Putting it All Together](#putting-it-all-together)
* [Prerequisites](#prerequisites)
* [Supported Operating Systems](#supported-operating-systems)
* [Deploying Demo from Google Cloud Shell](#deploying-demo-from-google-cloud-shell)
* [Deploying Demo without Cloud Shell](#deploying-demo-without-cloud-shell)
Expand Down Expand Up @@ -115,24 +114,6 @@ In the diagram, note:

![](./images/istio-gke.png)

## Prerequisites

### Run Demo in a Google Cloud Shell

Click the button below to run the demo in a [Google Cloud Shell](https://cloud.google.com/shell/docs/).

[![Open in Cloud Shell](http://gstatic.com/cloudssh/images/open-btn.svg)](https://console.cloud.google.com/cloudshell/open?git_repo=https%3A%2F%2Fgithub.com%2FGoogleCloudPlatform%2Fgke-istio-telemetry-demo&page=editor&tutorial=README.md)

All the tools for the demo are installed. When using Cloud Shell execute the following
command in order to setup gcloud cli. When executing this command please setup your region
and zone.

```console
gcloud init
```

A Google Cloud account and a project with billing enabled are required for this demo to function. If you do not have a Google Cloud account please sign up for a free trial [here](https://cloud.google.com).

### Supported Operating Systems

This demo can be run from MacOS, Linux, or, alternatively, directly from [Google Cloud Shell](https://cloud.google.com/shell/docs/). The latter option is the simplest as it only requires browser access to GCP and no additional software is required. Instructions for both alternatives can be found below.
Expand All @@ -145,7 +126,13 @@ _NOTE: This section can be skipped if the cloud deployment is being performed wi

Click the button below to open the demo in your Cloud Shell:

[![Open in Cloud Shell](http://gstatic.com/cloudssh/images/open-btn.svg)](https://console.cloud.google.com/cloudshell/open?git_repo=https%3A%2F%2Fgithub.com%2FGoogleCloudPlatform%2Fgke-istio-telemetry-demo&page=editor&tutorial=README.md)
[![Open in Cloud Shell](http://gstatic.com/cloudssh/images/open-btn.svg)](https://console.cloud.google.com/cloudshell/open?cloudshell_git_repo=https://github.com/GoogleCloudPlatform/gke-istio-telemetry-demo.git&cloudshell_image=gcr.io/graphite-cloud-shell-images/terraform:latest&cloudshell_tutorial=README.md)

Use the `--recursive` argument to download dependencies provided via a git submodule.

```shell
git submodule update --init --recursive
```

To prepare [gcloud](https://cloud.google.com/sdk/gcloud/) for use in Cloud Shell, execute the following command in the terminal at the bottom of the browser window you just opened:

Expand Down