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.

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

en,zh: bump operator to v1.4.6 #2416

Merged
merged 1 commit into from
Jul 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions en/advanced-statefulset.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ The [advanced StatefulSet controller](https://github.com/pingcap/advanced-statef
{{< copyable "shell-regular" >}}

```shell
kubectl apply -f https://raw.githubusercontent.com/pingcap/tidb-operator/v1.4.5/manifests/advanced-statefulset-crd.v1beta1.yaml
kubectl apply -f https://raw.githubusercontent.com/pingcap/tidb-operator/v1.4.6/manifests/advanced-statefulset-crd.v1beta1.yaml
```

* For Kubernetes versions >= 1.16:

{{< copyable "shell-regular" >}}

```
kubectl apply -f https://raw.githubusercontent.com/pingcap/tidb-operator/v1.4.5/manifests/advanced-statefulset-crd.v1.yaml
kubectl apply -f https://raw.githubusercontent.com/pingcap/tidb-operator/v1.4.6/manifests/advanced-statefulset-crd.v1.yaml
```

2. Enable the `AdvancedStatefulSet` feature in `values.yaml` of the TiDB Operator chart:
Expand Down
4 changes: 2 additions & 2 deletions en/aggregate-multiple-cluster-monitor-data.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Thanos provides [Thanos Query](https://thanos.io/tip/components/query.md/) compo
{{< copyable "shell-regular" >}}

```shell
kubectl -n ${namespace} apply -f https://raw.githubusercontent.com/pingcap/tidb-operator/v1.4.5/examples/monitor-with-thanos/tidb-monitor.yaml
kubectl -n ${namespace} apply -f https://raw.githubusercontent.com/pingcap/tidb-operator/v1.4.6/examples/monitor-with-thanos/tidb-monitor.yaml
```

2. Deploy the Thanos Query component.
Expand All @@ -34,7 +34,7 @@ Thanos provides [Thanos Query](https://thanos.io/tip/components/query.md/) compo
{{< copyable "shell-regular" >}}

```
curl -sl -O https://raw.githubusercontent.com/pingcap/tidb-operator/v1.4.5/examples/monitor-with-thanos/thanos-query.yaml
curl -sl -O https://raw.githubusercontent.com/pingcap/tidb-operator/v1.4.6/examples/monitor-with-thanos/thanos-query.yaml
```

2. Manually modify the `--store` parameter in the `thanos-query.yaml` file by updating `basic-prometheus:10901` to `basic-prometheus.${namespace}:10901`.
Expand Down
4 changes: 2 additions & 2 deletions en/backup-to-s3.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,12 @@ GRANT

### Step 1: Prepare for ad-hoc full backup

1. Execute the following command to create the role-based access control (RBAC) resources in the `tidb-cluster` namespace based on [backup-rbac.yaml](https://raw.githubusercontent.com/pingcap/tidb-operator/v1.4.5/manifests/backup/backup-rbac.yaml):
1. Execute the following command to create the role-based access control (RBAC) resources in the `tidb-cluster` namespace based on [backup-rbac.yaml](https://raw.githubusercontent.com/pingcap/tidb-operator/v1.4.6/manifests/backup/backup-rbac.yaml):

{{< copyable "shell-regular" >}}

```shell
kubectl apply -f https://raw.githubusercontent.com/pingcap/tidb-operator/v1.4.5/manifests/backup/backup-rbac.yaml -n tidb-cluster
kubectl apply -f https://raw.githubusercontent.com/pingcap/tidb-operator/v1.4.6/manifests/backup/backup-rbac.yaml -n tidb-cluster
```

2. Grant permissions to the remote storage.
Expand Down
6 changes: 3 additions & 3 deletions en/cheat-sheet.md
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@ For example:
{{< copyable "shell-regular" >}}

```shell
helm inspect values pingcap/tidb-operator --version=v1.4.5 > values-tidb-operator.yaml
helm inspect values pingcap/tidb-operator --version=v1.4.6 > values-tidb-operator.yaml
```

### Deploy using Helm chart
Expand All @@ -508,7 +508,7 @@ For example:
{{< copyable "shell-regular" >}}

```shell
helm install tidb-operator pingcap/tidb-operator --namespace=tidb-admin --version=v1.4.5 -f values-tidb-operator.yaml
helm install tidb-operator pingcap/tidb-operator --namespace=tidb-admin --version=v1.4.6 -f values-tidb-operator.yaml
```

### View the deployed Helm release
Expand All @@ -532,7 +532,7 @@ For example:
{{< copyable "shell-regular" >}}

```shell
helm upgrade tidb-operator pingcap/tidb-operator --version=v1.4.5 -f values-tidb-operator.yaml
helm upgrade tidb-operator pingcap/tidb-operator --version=v1.4.6 -f values-tidb-operator.yaml
```

### Delete Helm release
Expand Down
4 changes: 2 additions & 2 deletions en/configure-storage-class.md
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ The `/mnt/ssd`, `/mnt/sharedssd`, `/mnt/monitoring`, and `/mnt/backup` directori
1. Download the deployment file for the local-volume-provisioner.

```shell
wget https://raw.githubusercontent.com/pingcap/tidb-operator/v1.4.5/examples/local-pv/local-volume-provisioner.yaml
wget https://raw.githubusercontent.com/pingcap/tidb-operator/v1.4.6/examples/local-pv/local-volume-provisioner.yaml
```

2. If you are using the same discovery directory as described in [Step 1: Pre-allocate local storage](#step-1-pre-allocate-local-storage), you can skip this step. If you are using a different path for the discovery directory than in the previous step, you need to modify the ConfigMap and DaemonSet spec.
Expand Down Expand Up @@ -162,7 +162,7 @@ The `/mnt/ssd`, `/mnt/sharedssd`, `/mnt/monitoring`, and `/mnt/backup` directori
3. Deploy the `local-volume-provisioner`.

```shell
kubectl apply -f https://raw.githubusercontent.com/pingcap/tidb-operator/v1.4.5/manifests/local-dind/local-volume-provisioner.yaml
kubectl apply -f https://raw.githubusercontent.com/pingcap/tidb-operator/v1.4.6/manifests/local-dind/local-volume-provisioner.yaml
```

4. Check the status of the Pod and PV.
Expand Down
2 changes: 1 addition & 1 deletion en/deploy-on-alibaba-cloud.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ All the instances except ACK mandatory workers are deployed across availability
tikv_count = 3
tidb_count = 2
pd_count = 3
operator_version = "v1.4.5"
operator_version = "v1.4.6"
```

* To deploy TiFlash in the cluster, set `create_tiflash_node_pool = true` in `terraform.tfvars`. You can also configure the node count and instance type of the TiFlash node pool by modifying `tiflash_count` and `tiflash_instance_type`. By default, the value of `tiflash_count` is `2`, and the value of `tiflash_instance_type` is `ecs.i2.2xlarge`.
Expand Down
8 changes: 4 additions & 4 deletions en/deploy-on-aws-eks.md
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ The following `c5d.4xlarge` example shows how to configure StorageClass for the

2. [Mount the local storage](https://github.com/kubernetes-sigs/sig-storage-local-static-provisioner/blob/master/docs/operations.md#use-a-whole-disk-as-a-filesystem-pv) to the `/mnt/ssd` directory.

3. According to the mounting configuration, modify the [local-volume-provisioner.yaml](https://raw.githubusercontent.com/pingcap/tidb-operator/v1.4.5/manifests/eks/local-volume-provisioner.yaml) file.
3. According to the mounting configuration, modify the [local-volume-provisioner.yaml](https://raw.githubusercontent.com/pingcap/tidb-operator/v1.4.6/manifests/eks/local-volume-provisioner.yaml) file.

4. Deploy and create a `local-storage` storage class using the modified `local-volume-provisioner.yaml` file.

Expand Down Expand Up @@ -350,9 +350,9 @@ First, download the sample `TidbCluster` and `TidbMonitor` configuration files:
{{< copyable "shell-regular" >}}

```shell
curl -O https://raw.githubusercontent.com/pingcap/tidb-operator/v1.4.5/examples/aws/tidb-cluster.yaml && \
curl -O https://raw.githubusercontent.com/pingcap/tidb-operator/v1.4.5/examples/aws/tidb-monitor.yaml && \
curl -O https://raw.githubusercontent.com/pingcap/tidb-operator/v1.4.5/examples/aws/tidb-dashboard.yaml
curl -O https://raw.githubusercontent.com/pingcap/tidb-operator/v1.4.6/examples/aws/tidb-cluster.yaml && \
curl -O https://raw.githubusercontent.com/pingcap/tidb-operator/v1.4.6/examples/aws/tidb-monitor.yaml && \
curl -O https://raw.githubusercontent.com/pingcap/tidb-operator/v1.4.6/examples/aws/tidb-dashboard.yaml
```

Refer to [configure the TiDB cluster](configure-a-tidb-cluster.md) to further customize and configure the CR before applying.
Expand Down
8 changes: 4 additions & 4 deletions en/deploy-on-azure-aks.md
Original file line number Diff line number Diff line change
Expand Up @@ -237,9 +237,9 @@ First, download the sample `TidbCluster` and `TidbMonitor` configuration files:
{{< copyable "shell-regular" >}}

```shell
curl -O https://raw.githubusercontent.com/pingcap/tidb-operator/v1.4.5/examples/aks/tidb-cluster.yaml && \
curl -O https://raw.githubusercontent.com/pingcap/tidb-operator/v1.4.5/examples/aks/tidb-monitor.yaml && \
curl -O https://raw.githubusercontent.com/pingcap/tidb-operator/v1.4.5/examples/aks/tidb-dashboard.yaml
curl -O https://raw.githubusercontent.com/pingcap/tidb-operator/v1.4.6/examples/aks/tidb-cluster.yaml && \
curl -O https://raw.githubusercontent.com/pingcap/tidb-operator/v1.4.6/examples/aks/tidb-monitor.yaml && \
curl -O https://raw.githubusercontent.com/pingcap/tidb-operator/v1.4.6/examples/aks/tidb-dashboard.yaml
```

Refer to [configure the TiDB cluster](configure-a-tidb-cluster.md) to further customize and configure the CR before applying.
Expand Down Expand Up @@ -599,7 +599,7 @@ For instance types that provide local disks, refer to [Lsv2-series](https://docs
{{< copyable "shell-regular" >}}

```shell
kubectl apply -f https://raw.githubusercontent.com/pingcap/tidb-operator/v1.4.5/manifests/eks/local-volume-provisioner.yaml
kubectl apply -f https://raw.githubusercontent.com/pingcap/tidb-operator/v1.4.6/manifests/eks/local-volume-provisioner.yaml
```

3. Use local storage.
Expand Down
8 changes: 4 additions & 4 deletions en/deploy-on-gcp-gke.md
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ If you need to simulate bare-metal performance, some GCP instance types provide
{{< copyable "shell-regular" >}}

```shell
kubectl apply -f https://raw.githubusercontent.com/pingcap/tidb-operator/v1.4.5/manifests/gke/local-ssd-provision/local-ssd-provision.yaml
kubectl apply -f https://raw.githubusercontent.com/pingcap/tidb-operator/v1.4.6/manifests/gke/local-ssd-provision/local-ssd-provision.yaml
```

3. Use the local storage.
Expand Down Expand Up @@ -172,9 +172,9 @@ First, download the sample `TidbCluster` and `TidbMonitor` configuration files:
{{< copyable "shell-regular" >}}

```shell
curl -O https://raw.githubusercontent.com/pingcap/tidb-operator/v1.4.5/examples/gcp/tidb-cluster.yaml && \
curl -O https://raw.githubusercontent.com/pingcap/tidb-operator/v1.4.5/examples/gcp/tidb-monitor.yaml && \
curl -O https://raw.githubusercontent.com/pingcap/tidb-operator/v1.4.5/examples/gcp/tidb-dashboard.yaml
curl -O https://raw.githubusercontent.com/pingcap/tidb-operator/v1.4.6/examples/gcp/tidb-cluster.yaml && \
curl -O https://raw.githubusercontent.com/pingcap/tidb-operator/v1.4.6/examples/gcp/tidb-monitor.yaml && \
curl -O https://raw.githubusercontent.com/pingcap/tidb-operator/v1.4.6/examples/gcp/tidb-dashboard.yaml
```

Refer to [configure the TiDB cluster](configure-a-tidb-cluster.md) to further customize and configure the CR before applying.
Expand Down
8 changes: 4 additions & 4 deletions en/deploy-tidb-from-kubernetes-gke.md
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ If you see `Ready` for all nodes, congratulations. You've set up your first Kube
TiDB Operator uses [Custom Resource Definition (CRD)](https://kubernetes.io/docs/concepts/extend-kubernetes/api-extension/custom-resources/#customresourcedefinitions) to extend Kubernetes. Therefore, to use TiDB Operator, you must first create the `TidbCluster` CRD.

```shell
kubectl create -f https://raw.githubusercontent.com/pingcap/tidb-operator/v1.4.5/manifests/crd.yaml && \
kubectl create -f https://raw.githubusercontent.com/pingcap/tidb-operator/v1.4.6/manifests/crd.yaml && \
kubectl get crd tidbclusters.pingcap.com
```

Expand All @@ -108,7 +108,7 @@ After the `TidbCluster` CRD is created, install TiDB Operator in your Kubernetes

```shell
kubectl create namespace tidb-admin
helm install --namespace tidb-admin tidb-operator pingcap/tidb-operator --version v1.4.5
helm install --namespace tidb-admin tidb-operator pingcap/tidb-operator --version v1.4.6
kubectl get po -n tidb-admin -l app.kubernetes.io/name=tidb-operator
```

Expand All @@ -125,13 +125,13 @@ To deploy the TiDB cluster, perform the following steps:
2. Deploy the TiDB cluster:

``` shell
kubectl apply -f https://raw.githubusercontent.com/pingcap/tidb-operator/v1.4.5/examples/basic/tidb-cluster.yaml -n demo
kubectl apply -f https://raw.githubusercontent.com/pingcap/tidb-operator/v1.4.6/examples/basic/tidb-cluster.yaml -n demo
```

3. Deploy the TiDB cluster monitor:

``` shell
kubectl apply -f https://raw.githubusercontent.com/pingcap/tidb-operator/v1.4.5/examples/basic/tidb-monitor.yaml -n demo
kubectl apply -f https://raw.githubusercontent.com/pingcap/tidb-operator/v1.4.6/examples/basic/tidb-monitor.yaml -n demo
```

4. View the Pod status:
Expand Down
28 changes: 14 additions & 14 deletions en/deploy-tidb-operator.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,15 @@ TiDB Operator uses [Custom Resource Definition (CRD)](https://kubernetes.io/docs
{{< copyable "shell-regular" >}}

```shell
kubectl create -f https://raw.githubusercontent.com/pingcap/tidb-operator/v1.4.5/manifests/crd.yaml
kubectl create -f https://raw.githubusercontent.com/pingcap/tidb-operator/v1.4.6/manifests/crd.yaml
```

If the server cannot access the Internet, you need to download the `crd.yaml` file on a machine with Internet access before installing:

{{< copyable "shell-regular" >}}

```shell
wget https://raw.githubusercontent.com/pingcap/tidb-operator/v1.4.5/manifests/crd.yaml
wget https://raw.githubusercontent.com/pingcap/tidb-operator/v1.4.6/manifests/crd.yaml
kubectl create -f ./crd.yaml
```

Expand Down Expand Up @@ -100,7 +100,7 @@ When you use TiDB Operator, `tidb-scheduler` is not mandatory. Refer to [tidb-sc

> **Note:**
>
> `${chart_version}` represents the chart version of TiDB Operator. For example, `v1.4.5`. You can view the currently supported versions by running the `helm search repo -l tidb-operator` command.
> `${chart_version}` represents the chart version of TiDB Operator. For example, `v1.4.6`. You can view the currently supported versions by running the `helm search repo -l tidb-operator` command.

2. Configure TiDB Operator

Expand Down Expand Up @@ -148,15 +148,15 @@ If your server cannot access the Internet, install TiDB Operator offline by the
{{< copyable "shell-regular" >}}

```shell
wget http://charts.pingcap.org/tidb-operator-v1.4.5.tgz
wget http://charts.pingcap.org/tidb-operator-v1.4.6.tgz
```

Copy the `tidb-operator-v1.4.5.tgz` file to the target server and extract it to the current directory:
Copy the `tidb-operator-v1.4.6.tgz` file to the target server and extract it to the current directory:

{{< copyable "shell-regular" >}}

```shell
tar zxvf tidb-operator.v1.4.5.tgz
tar zxvf tidb-operator.v1.4.6.tgz
```

2. Download the Docker images used by TiDB Operator
Expand All @@ -168,8 +168,8 @@ If your server cannot access the Internet, install TiDB Operator offline by the
{{< copyable "" >}}

```shell
pingcap/tidb-operator:v1.4.5
pingcap/tidb-backup-manager:v1.4.5
pingcap/tidb-operator:v1.4.6
pingcap/tidb-backup-manager:v1.4.6
bitnami/kubectl:latest
pingcap/advanced-statefulset:v0.3.3
k8s.gcr.io/kube-scheduler:v1.16.9
Expand All @@ -182,13 +182,13 @@ If your server cannot access the Internet, install TiDB Operator offline by the
{{< copyable "shell-regular" >}}

```shell
docker pull pingcap/tidb-operator:v1.4.5
docker pull pingcap/tidb-backup-manager:v1.4.5
docker pull pingcap/tidb-operator:v1.4.6
docker pull pingcap/tidb-backup-manager:v1.4.6
docker pull bitnami/kubectl:latest
docker pull pingcap/advanced-statefulset:v0.3.3

docker save -o tidb-operator-v1.4.5.tar pingcap/tidb-operator:v1.4.5
docker save -o tidb-backup-manager-v1.4.5.tar pingcap/tidb-backup-manager:v1.4.5
docker save -o tidb-operator-v1.4.6.tar pingcap/tidb-operator:v1.4.6
docker save -o tidb-backup-manager-v1.4.6.tar pingcap/tidb-backup-manager:v1.4.6
docker save -o bitnami-kubectl.tar bitnami/kubectl:latest
docker save -o advanced-statefulset-v0.3.3.tar pingcap/advanced-statefulset:v0.3.3
```
Expand All @@ -198,8 +198,8 @@ If your server cannot access the Internet, install TiDB Operator offline by the
{{< copyable "shell-regular" >}}

```shell
docker load -i tidb-operator-v1.4.5.tar
docker load -i tidb-backup-manager-v1.4.5.tar
docker load -i tidb-operator-v1.4.6.tar
docker load -i tidb-backup-manager-v1.4.6.tar
docker load -i bitnami-kubectl.tar
docker load -i advanced-statefulset-v0.3.3.tar
```
Expand Down
10 changes: 5 additions & 5 deletions en/get-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ First, you need to install the Custom Resource Definitions (CRDs) that are requi
To install the CRDs, run the following command:

```shell
kubectl create -f https://raw.githubusercontent.com/pingcap/tidb-operator/v1.4.5/manifests/crd.yaml
kubectl create -f https://raw.githubusercontent.com/pingcap/tidb-operator/v1.4.6/manifests/crd.yaml
```

<details>
Expand Down Expand Up @@ -233,7 +233,7 @@ To install TiDB Operator, you can use [Helm 3](https://helm.sh/docs/intro/instal
3. Install TiDB Operator:

```shell
helm install --namespace tidb-admin tidb-operator pingcap/tidb-operator --version v1.4.5
helm install --namespace tidb-admin tidb-operator pingcap/tidb-operator --version v1.4.6
```

<details>
Expand Down Expand Up @@ -281,7 +281,7 @@ This section describes how to deploy a TiDB cluster and its monitoring services.

```shell
kubectl create namespace tidb-cluster && \
kubectl -n tidb-cluster apply -f https://raw.githubusercontent.com/pingcap/tidb-operator/v1.4.5/examples/basic/tidb-cluster.yaml
kubectl -n tidb-cluster apply -f https://raw.githubusercontent.com/pingcap/tidb-operator/v1.4.6/examples/basic/tidb-cluster.yaml
```

<details>
Expand All @@ -299,7 +299,7 @@ If you need to deploy a TiDB cluster on an ARM64 machine, refer to [Deploying a
### Deploy TiDB Dashboard independently

``` shell
kubectl -n tidb-cluster apply -f https://raw.githubusercontent.com/pingcap/tidb-operator/v1.4.5/examples/basic/tidb-dashboard.yaml
kubectl -n tidb-cluster apply -f https://raw.githubusercontent.com/pingcap/tidb-operator/v1.4.6/examples/basic/tidb-dashboard.yaml
```

<details>
Expand All @@ -314,7 +314,7 @@ tidbdashboard.pingcap.com/basic created
### Deploy TiDB monitoring services

``` shell
kubectl -n tidb-cluster apply -f https://raw.githubusercontent.com/pingcap/tidb-operator/v1.4.5/examples/basic/tidb-monitor.yaml
kubectl -n tidb-cluster apply -f https://raw.githubusercontent.com/pingcap/tidb-operator/v1.4.6/examples/basic/tidb-monitor.yaml
```

<details>
Expand Down
20 changes: 10 additions & 10 deletions en/tidb-toolkit.md
Original file line number Diff line number Diff line change
Expand Up @@ -200,12 +200,12 @@ helm search repo pingcap

```
NAME CHART VERSION APP VERSION DESCRIPTION
pingcap/tidb-backup v1.4.5 A Helm chart for TiDB Backup or Restore
pingcap/tidb-cluster v1.4.5 A Helm chart for TiDB Cluster
pingcap/tidb-drainer v1.4.5 A Helm chart for TiDB Binlog drainer.
pingcap/tidb-lightning v1.4.5 A Helm chart for TiDB Lightning
pingcap/tidb-operator v1.4.5 v1.4.5 tidb-operator Helm chart for Kubernetes
pingcap/tikv-importer v1.4.5 A Helm chart for TiKV Importer
pingcap/tidb-backup v1.4.6 A Helm chart for TiDB Backup or Restore
pingcap/tidb-cluster v1.4.6 A Helm chart for TiDB Cluster
pingcap/tidb-drainer v1.4.6 A Helm chart for TiDB Binlog drainer.
pingcap/tidb-lightning v1.4.6 A Helm chart for TiDB Lightning
pingcap/tidb-operator v1.4.6 v1.4.6 tidb-operator Helm chart for Kubernetes
pingcap/tikv-importer v1.4.6 A Helm chart for TiKV Importer
```

When a new version of chart has been released, you can use `helm repo update` to update the repository cached locally:
Expand Down Expand Up @@ -267,17 +267,17 @@ Use the following command to download the chart file required for cluster instal
{{< copyable "shell-regular" >}}

```shell
wget http://charts.pingcap.org/tidb-operator-v1.4.5.tgz
wget http://charts.pingcap.org/tidb-drainer-v1.4.5.tgz
wget http://charts.pingcap.org/tidb-lightning-v1.4.5.tgz
wget http://charts.pingcap.org/tidb-operator-v1.4.6.tgz
wget http://charts.pingcap.org/tidb-drainer-v1.4.6.tgz
wget http://charts.pingcap.org/tidb-lightning-v1.4.6.tgz
```

Copy these chart files to the server and decompress them. You can use these charts to install the corresponding components by running the `helm install` command. Take `tidb-operator` as an example:

{{< copyable "shell-regular" >}}

```shell
tar zxvf tidb-operator.v1.4.5.tgz
tar zxvf tidb-operator.v1.4.6.tgz
helm install ${release_name} ./tidb-operator --namespace=${namespace}
```

Expand Down
Loading
Loading