Merge branch 'master' into fix332

pingcap · May 14, 2019 · 7de7e9f · 7de7e9f
2 parents e13aa45 + ea05ed9
commit 7de7e9f
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -54,7 +54,7 @@ Choose one of the following tutorials:
 
 * [Deploy TiDB by launching an AWS EKS cluster](./docs/aws-eks-tutorial.md)
 
-* [Deploy TiDB Operator and TiDB Cluster on Alibaba Cloud Kubernetes](./deploy/alicloud/README.md)
+* [Deploy TiDB Operator and TiDB Cluster on Alibaba Cloud Kubernetes](/deploy/aliyun/README.md)
 
 * [Deploy TiDB in the minikube cluster](./docs/minikube-tutorial.md)
 

diff --git a/docs/cli-manual.md b/docs/cli-manual.md
@@ -1,8 +1,8 @@
-# The TiDB Kubernetes Contorl(tkctl) User Manual
+# The TiDB Kubernetes Control(tkctl) User Manual
 
 > **Disclaimer**: The tkctl CLI tool is currently **Alpha**. The design and sub-commands may change in the future, use at your own risk.
 
-The TiDB Kubernetes Control(tkctl) is a command line utility for TiDB operators to operate and diagnose their TiDB clusters in kubernetes.
+The TiDB Kubernetes Control(tkctl) is a command line utility for TiDB operators to operate and diagnose their TiDB clusters in Kubernetes.
 
 - [Installation](#installation)
     - [Build from Source](#build-from-source)

diff --git a/docs/local-dind-tutorial.md b/docs/local-dind-tutorial.md
@@ -43,6 +43,15 @@ $ manifests/local-dind/dind-cluster-v1.12.sh up
 $ KUBE_REPO_PREFIX=uhub.ucloud.cn/pingcap manifests/local-dind/dind-cluster-v1.12.sh up
 ```
 
+> **Note:** An alternative solution is to configure HTTP proxies in DinD.
+
+```
+$ export DIND_HTTP_PROXY=http://<ip>:<port>
+$ export DIND_HTTPS_PROXY=http://<ip>:<port>
+$ export DIND_NO_PROXY=.svc,.local,127.0.0.1,0,1,2,3,4,5,6,7,8,9 # whitelist internal domains and IP addresses
+$ manifests/local-dind/dind-cluster-v1.12.sh up
+```
+
 ## Step 2: Install TiDB Operator in the DinD Kubernetes cluster
 
 ```sh

diff --git a/manifests/local-dind/dind-cluster-v1.10.sh b/manifests/local-dind/dind-cluster-v1.10.sh
@@ -52,7 +52,7 @@ if [[ $(uname) == Linux && -z ${DOCKER_HOST:-} ]]; then
     using_local_linuxdocker=1
 fi
 
-EMBEDDED_CONFIG=y;DIND_IMAGE=mirantis/kubeadm-dind-cluster@sha256:ba1b61973fb4761f209580c599c17eab7c2e1bead5dfe496aab47c5ff672b05f
+EMBEDDED_CONFIG=y;DIND_IMAGE=mirantis/kubeadm-dind-cluster@sha256:0a68bdc682af3e102bafb9efa304a1b50aec0b2c64c086c34004d4d289e5b173
 
 KUBE_REPO_PREFIX="${KUBE_REPO_PREFIX:-}"
 if [[ -n ${KUBE_REPO_PREFIX} ]];then

diff --git a/manifests/local-dind/dind-cluster-v1.12.sh b/manifests/local-dind/dind-cluster-v1.12.sh
@@ -52,7 +52,7 @@ if [[ $(uname) == Linux && -z ${DOCKER_HOST:-} ]]; then
     using_local_linuxdocker=1
 fi
 
-EMBEDDED_CONFIG=y;DIND_IMAGE=mirantis/kubeadm-dind-cluster@sha256:8e679951101f3f2030e77a1146cc514631f21f424027fcc003fc78a0337eb730
+EMBEDDED_CONFIG=y;DIND_IMAGE=mirantis/kubeadm-dind-cluster@sha256:48782c23bedd3f9c3d42af0ab0417eeff7d7884eac20a67adcb0c8534a97fce1
 
 KUBE_REPO_PREFIX="${KUBE_REPO_PREFIX:-}"
 if [[ -n ${KUBE_REPO_PREFIX} ]];then