From 6c44efc6e4d559f9d40b92031f7f30747776d933 Mon Sep 17 00:00:00 2001 From: Morgan Tocker Date: Tue, 4 Sep 2018 19:33:53 -0600 Subject: [PATCH 1/7] Add GKE Deployment --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 2b93486af25cb..eaf85361a7ab9 100644 --- a/README.md +++ b/README.md @@ -83,6 +83,7 @@ - [Docker Deployment](op-guide/docker-deployment.md) - [Docker Compose Deployment](op-guide/docker-compose.md) - [Cross-Region Deployment](op-guide/location-awareness.md) + - [Google Kubernetes Engine](op-guide/google-kubernetes-engine.md) + Configure - [Configuration Flags](op-guide/configuration.md) - [Configuration File Description](op-guide/tidb-config-file.md) From 949487d3ea1a90f5140b645b4eda014929ffed59 Mon Sep 17 00:00:00 2001 From: Morgan Tocker Date: Tue, 4 Sep 2018 19:42:13 -0600 Subject: [PATCH 2/7] Added GKE Tutorial --- op-guide/google-kubernetes-engine.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 op-guide/google-kubernetes-engine.md diff --git a/op-guide/google-kubernetes-engine.md b/op-guide/google-kubernetes-engine.md new file mode 100644 index 0000000000000..7b4f29d08dea6 --- /dev/null +++ b/op-guide/google-kubernetes-engine.md @@ -0,0 +1,15 @@ +--- +title: TiDB Google Kubernetes Engine Deployment +summary: Use Google Kubernetes Engine (GKE) to quickly deploy a TiDB cluster using TiDB Operator +category: operations +--- + +# Google Kubernetes Engine (GKE) + +[TiDB Operator](https://github.com/pingcap/tidb-operator) manages TiDB clusters on [Kubernetes](https://kubernetes.io) +and automates tasks related to operating a TiDB cluster. It makes TiDB a truly cloud-native database. The TiDB Operator +tutorial for GKE runs directly in the Google Cloud Shell. + +> **Warning:** Currently, TiDB Operator is work in progress [WIP] and is NOT ready for production. Use at your own risk. + +[![Open in Cloud Shell](https://gstatic.com/cloudssh/images/open-btn.png)](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/pingcap/tidb-operator&tutorial=docs/google-kubernetes-tutorial.md) From fce4e307855afeec78b5fbdac7e3c8b739d88554 Mon Sep 17 00:00:00 2001 From: Morgan Tocker Date: Tue, 4 Sep 2018 21:41:46 -0600 Subject: [PATCH 3/7] Renamed to Kubernetes --- op-guide/{google-kubernetes-engine.md => kubernetes.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename op-guide/{google-kubernetes-engine.md => kubernetes.md} (100%) diff --git a/op-guide/google-kubernetes-engine.md b/op-guide/kubernetes.md similarity index 100% rename from op-guide/google-kubernetes-engine.md rename to op-guide/kubernetes.md From 3034f07d65759b035a84a8a619a2c70ede47e5a4 Mon Sep 17 00:00:00 2001 From: Morgan Tocker Date: Tue, 4 Sep 2018 21:42:23 -0600 Subject: [PATCH 4/7] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index eaf85361a7ab9..66d22d3cb6def 100644 --- a/README.md +++ b/README.md @@ -83,7 +83,7 @@ - [Docker Deployment](op-guide/docker-deployment.md) - [Docker Compose Deployment](op-guide/docker-compose.md) - [Cross-Region Deployment](op-guide/location-awareness.md) - - [Google Kubernetes Engine](op-guide/google-kubernetes-engine.md) + - [Kubernetes](op-guide/kubernetes.md) + Configure - [Configuration Flags](op-guide/configuration.md) - [Configuration File Description](op-guide/tidb-config-file.md) From b160b15b98a8319c78bd0eabfb315a9224aed1f5 Mon Sep 17 00:00:00 2001 From: Morgan Tocker Date: Tue, 4 Sep 2018 21:43:34 -0600 Subject: [PATCH 5/7] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 66d22d3cb6def..3e114414243b5 100644 --- a/README.md +++ b/README.md @@ -83,7 +83,7 @@ - [Docker Deployment](op-guide/docker-deployment.md) - [Docker Compose Deployment](op-guide/docker-compose.md) - [Cross-Region Deployment](op-guide/location-awareness.md) - - [Kubernetes](op-guide/kubernetes.md) + - [Kubernetes Deployment](op-guide/kubernetes.md) + Configure - [Configuration Flags](op-guide/configuration.md) - [Configuration File Description](op-guide/tidb-config-file.md) From 7dbbb65ad60f05404af7be76e297057683f0d901 Mon Sep 17 00:00:00 2001 From: Morgan Tocker Date: Tue, 4 Sep 2018 21:51:52 -0600 Subject: [PATCH 6/7] Changed to Kubernetes generic --- op-guide/kubernetes.md | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/op-guide/kubernetes.md b/op-guide/kubernetes.md index 7b4f29d08dea6..50e9e78b6010b 100644 --- a/op-guide/kubernetes.md +++ b/op-guide/kubernetes.md @@ -1,15 +1,24 @@ --- -title: TiDB Google Kubernetes Engine Deployment -summary: Use Google Kubernetes Engine (GKE) to quickly deploy a TiDB cluster using TiDB Operator +title: TiDB Deployment on Kubernetes +summary: Use TiDB Operator to quickly deploy a TiDB cluster on Kubernetes category: operations --- -# Google Kubernetes Engine (GKE) +# TiDB Deployment on Kubernetes [TiDB Operator](https://github.com/pingcap/tidb-operator) manages TiDB clusters on [Kubernetes](https://kubernetes.io) -and automates tasks related to operating a TiDB cluster. It makes TiDB a truly cloud-native database. The TiDB Operator -tutorial for GKE runs directly in the Google Cloud Shell. +and automates tasks related to operating a TiDB cluster. It makes TiDB a truly cloud-native database. > **Warning:** Currently, TiDB Operator is work in progress [WIP] and is NOT ready for production. Use at your own risk. +## Google Kubernetes Engine (GKE) + +The TiDB Operator tutorial for GKE runs directly in the Google Cloud Shell. + [![Open in Cloud Shell](https://gstatic.com/cloudssh/images/open-btn.png)](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/pingcap/tidb-operator&tutorial=docs/google-kubernetes-tutorial.md) + +## Local Install using Docker in Docker + +Docker in Docker (DinD) runs Docker containers as virtual machines and runs another layer of Docker containers inside the first layer of Docker containers. kubeadm-dind-cluster uses this technology to run the Kubernetes cluster in Docker containers. TiDB Operator uses a modified DinD script to manage the DinD Kubernetes cluster. + +[Continue reading tutorial on GitHub →](https://github.com/pingcap/tidb-operator/blob/master/docs/local-dind-tutorial.md) From f172c20dc847f37ba8fe210e9d137674c80f7c5e Mon Sep 17 00:00:00 2001 From: Morgan Tocker Date: Tue, 4 Sep 2018 21:53:05 -0600 Subject: [PATCH 7/7] Update kubernetes.md --- op-guide/kubernetes.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/op-guide/kubernetes.md b/op-guide/kubernetes.md index 50e9e78b6010b..08d4e79e09f58 100644 --- a/op-guide/kubernetes.md +++ b/op-guide/kubernetes.md @@ -17,8 +17,8 @@ The TiDB Operator tutorial for GKE runs directly in the Google Cloud Shell. [![Open in Cloud Shell](https://gstatic.com/cloudssh/images/open-btn.png)](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/pingcap/tidb-operator&tutorial=docs/google-kubernetes-tutorial.md) -## Local Install using Docker in Docker +## Local install using Docker in Docker -Docker in Docker (DinD) runs Docker containers as virtual machines and runs another layer of Docker containers inside the first layer of Docker containers. kubeadm-dind-cluster uses this technology to run the Kubernetes cluster in Docker containers. TiDB Operator uses a modified DinD script to manage the DinD Kubernetes cluster. +Docker in Docker (DinD) runs Docker containers as virtual machines and runs another layer of Docker containers inside the first layer of Docker containers. `kubeadm-dind-cluster` uses this technology to run the Kubernetes cluster in Docker containers. TiDB Operator uses a modified DinD script to manage the DinD Kubernetes cluster. [Continue reading tutorial on GitHub →](https://github.com/pingcap/tidb-operator/blob/master/docs/local-dind-tutorial.md)