Skip to content

*: add specific Helm version #1820

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

Merged
lilin90 merged 9 commits into from
Feb 21, 2020
Merged

*: add specific Helm version #1820

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
39f5a65
reference: specific Helm version
oraluben Feb 20, 2020
e8c515e
also v2.1
oraluben Feb 20, 2020
7b7dc10
Update dev/tidb-in-kubernetes/reference/tools/in-kubernetes.md
oraluben Feb 20, 2020
fd86bf2
Update v3.0/tidb-in-kubernetes/reference/tools/in-kubernetes.md
oraluben Feb 20, 2020
2cedb84
Update dev/tidb-in-kubernetes/reference/tools/in-kubernetes.md
oraluben Feb 20, 2020
061e89f
Update v2.1-legacy/op-guide/docker-compose.md
oraluben Feb 20, 2020
bcc2a89
Update dev/how-to/get-started/deploy-tidb-from-docker-compose.md
oraluben Feb 20, 2020
3acce72
Update v3.1/tidb-in-kubernetes/reference/tools/in-kubernetes.md
oraluben Feb 20, 2020
9cb4fcd
Merge branch 'master' into update-helm-version
lilin90 Feb 21, 2020
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
6 changes: 4 additions & 2 deletions dev/how-to/get-started/deploy-tidb-from-docker-compose.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,8 @@ To customize the cluster, you can edit the `docker-compose.yml` file directly. I

1. Install Helm.

[Helm](https://helm.sh) can be used as a template rendering engine. To use Helm, you only need to download its binary file:
[Helm](https://helm.sh) can be used as a template rendering engine. Make sure your Helm version >= 2.9.0 and < 3.0.0. To use Helm, you only need to download its binary file:
To use Helm, you only need to download its binary file:
Copy link
Copy Markdown
Contributor

@ran-huang ran-huang Feb 21, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This sentence repeats with the previous one.


```bash
curl https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get | bash
Expand All @@ -76,7 +77,8 @@ To customize the cluster, you can edit the `docker-compose.yml` file directly. I
For macOS, you can also install Helm using the following command in Homebrew:

```bash
brew install kubernetes-helm
brew install helm@2
brew link --force helm@2
```

2. Download `tidb-docker-compose`.
Expand Down
9 changes: 7 additions & 2 deletions dev/tidb-in-kubernetes/reference/tools/in-kubernetes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ tidb-ctl schema in mysql

## Use Helm

[Helm](https://helm.sh/) is a package management tool for Kubernetes. Refer to [Helm Documentation](https://github.com/helm/helm#install) to install Helm. The steps are as follows:
[Helm](https://helm.sh/) is a package management tool for Kubernetes. Make sure your Helm version >= 2.9.0 and < 3.0.0. The installation steps are as follows:

1. Install Helm client

Expand All @@ -148,7 +148,12 @@ tidb-ctl schema in mysql
curl https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get | bash
```

Or if on macOS, you can use homebrew to install Helm via the `brew install kubernetes-helm` command.
Or if on macOS, you can use Homebrew to install Helm via the following command:

```bash
brew install helm@2
brew link --force helm@2
```

2. Install Helm server.

Expand Down
7 changes: 4 additions & 3 deletions v2.1-legacy/op-guide/docker-compose.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ To customize the cluster, you can edit the `docker-compose.yml` file directly. I

1. Install Helm.

[Helm](https://helm.sh) can be used as a template rendering engine. To use Helm, you only need to download its binary file:
[Helm](https://helm.sh) can be used as a template rendering engine. Make sure your Helm version >= 2.9.0 and < 3.0.0. The installation steps are as follows:

```bash
curl https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get | bash
Expand All @@ -72,7 +72,8 @@ To customize the cluster, you can edit the `docker-compose.yml` file directly. I
For macOS, you can also install Helm using the following command in Homebrew:

```bash
brew install kubernetes-helm
brew install helm@2
brew link --force helm@2
```

2. Download `tidb-docker-compose`.
Expand Down Expand Up @@ -175,4 +176,4 @@ docker-compose exec tispark-master /opt/spark/bin/sparkR

For more details about TiSpark, see [here](../tispark/tispark-quick-start-guide.md).

Here is [a 5-minute tutorial](https://pingcap.com/blog/how_to_spin_up_an_htap_database_in_5_minutes_with_tidb_tispark/) for macOS users that shows how to spin up a standard TiDB cluster using Docker Compose on your local computer.
Here is [a 5-minute tutorial](https://pingcap.com/blog/how_to_spin_up_an_htap_database_in_5_minutes_with_tidb_tispark/) for macOS users that shows how to spin up a standard TiDB cluster using Docker Compose on your local computer.
9 changes: 7 additions & 2 deletions v3.0/tidb-in-kubernetes/reference/tools/in-kubernetes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ tidb-ctl schema in mysql

## Use Helm

[Helm](https://helm.sh/) is a package management tool for Kubernetes. Refer to [Helm Documentation](https://github.com/helm/helm#install) to install Helm. The steps are as follows:
[Helm](https://helm.sh/) is a package management tool for Kubernetes. Make sure your Helm version >= 2.9.0 and < 3.0.0. The installation steps are as follows:

1. Install Helm client

Expand All @@ -149,7 +149,12 @@ tidb-ctl schema in mysql
curl https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get | bash
```

Or if on macOS, you can use homebrew to install Helm via the `brew install kubernetes-helm` command.
For macOS, you can also install Helm using the following command in Homebrew:

```bash
brew install helm@2
brew link --force helm@2
```

2. Install Helm server.

Expand Down
9 changes: 7 additions & 2 deletions v3.1/tidb-in-kubernetes/reference/tools/in-kubernetes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ tidb-ctl schema in mysql

## Use Helm

[Helm](https://helm.sh/) is a package management tool for Kubernetes. Refer to [Helm Documentation](https://github.com/helm/helm#install) to install Helm. The steps are as follows:
[Helm](https://helm.sh/) is a package management tool for Kubernetes. Make sure your Helm version >= 2.9.0 and < 3.0.0. The installation steps are as follows:

1. Install Helm client

Expand All @@ -148,7 +148,12 @@ tidb-ctl schema in mysql
curl https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get | bash
```

Or if on macOS, you can use homebrew to install Helm via the `brew install kubernetes-helm` command.
For macOS, you can also install Helm using the following command in Homebrew:

```bash
brew install helm@2
brew link --force helm@2
```

2. Install Helm server.

Expand Down