From 62aee4ca3e87e98a65fa9f3887a9a7917fe51d3f Mon Sep 17 00:00:00 2001 From: DanielZhangQD Date: Wed, 23 Oct 2019 16:08:51 +0800 Subject: [PATCH 1/3] tidb lb is empty after terraform apply --- .../share/tidb-cluster-release/data.tf | 2 +- .../share/tidb-cluster-release/main.tf | 22 +++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/deploy/modules/share/tidb-cluster-release/data.tf b/deploy/modules/share/tidb-cluster-release/data.tf index fce6b832af..00a21f4e2c 100644 --- a/deploy/modules/share/tidb-cluster-release/data.tf +++ b/deploy/modules/share/tidb-cluster-release/data.tf @@ -1,5 +1,5 @@ data "external" "tidb_hostname" { - depends_on = [helm_release.tidb-cluster] + depends_on = [helm_release.tidb-cluster, null_resource.wait-lb-ip] working_dir = path.cwd program = ["bash", "-c", "kubectl --kubeconfig ${var.kubeconfig_filename} get svc -n ${var.cluster_name} ${var.cluster_name}-tidb -o json | jq '.status.loadBalancer.ingress[0]'"] } diff --git a/deploy/modules/share/tidb-cluster-release/main.tf b/deploy/modules/share/tidb-cluster-release/main.tf index de808a590d..d4b0639464 100644 --- a/deploy/modules/share/tidb-cluster-release/main.tf +++ b/deploy/modules/share/tidb-cluster-release/main.tf @@ -139,3 +139,25 @@ EOS } } } + +resource "null_resource" "wait-lb-ip" { + depends_on = [ + helm_release.tidb-cluster + ] + provisioner "local-exec" { + interpreter = ["bash", "-c"] + working_dir = path.cwd + command = < Date: Wed, 23 Oct 2019 19:10:21 +0800 Subject: [PATCH 2/3] update scheduler image for ali and lb key for gcp --- deploy/modules/aliyun/tidb-operator/operator.tf | 4 ++-- deploy/modules/gcp/tidb-cluster/main.tf | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/deploy/modules/aliyun/tidb-operator/operator.tf b/deploy/modules/aliyun/tidb-operator/operator.tf index 670e83b109..f119f14577 100644 --- a/deploy/modules/aliyun/tidb-operator/operator.tf +++ b/deploy/modules/aliyun/tidb-operator/operator.tf @@ -59,6 +59,6 @@ resource "helm_release" "tidb-operator" { set { name = "scheduler.kubeSchedulerImageName" - value = "gcr.akscn.io/google_containers/hyperkube" + value = "registry.cn-hangzhou.aliyuncs.com/google_containers/kube-scheduler-amd64" } -} \ No newline at end of file +} diff --git a/deploy/modules/gcp/tidb-cluster/main.tf b/deploy/modules/gcp/tidb-cluster/main.tf index c38973a0c3..7166ee7787 100644 --- a/deploy/modules/gcp/tidb-cluster/main.tf +++ b/deploy/modules/gcp/tidb-cluster/main.tf @@ -145,6 +145,7 @@ module "tidb-cluster" { kubeconfig_filename = var.kubeconfig_path base_values = file("${path.module}/values/default.yaml") wait_on_resource = [google_container_node_pool.tidb_pool, var.tidb_operator_id] + service_ingress_key = "ip" } resource "null_resource" "wait-lb-ip" { From 59fde59b0c17e9c328cbba548de5b608e7ad3936 Mon Sep 17 00:00:00 2001 From: DanielZhangQD Date: Thu, 24 Oct 2019 10:25:30 +0800 Subject: [PATCH 3/3] wait for monitoring lb --- .../share/tidb-cluster-release/data.tf | 2 +- .../share/tidb-cluster-release/main.tf | 22 +++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/deploy/modules/share/tidb-cluster-release/data.tf b/deploy/modules/share/tidb-cluster-release/data.tf index 00a21f4e2c..410e634d6c 100644 --- a/deploy/modules/share/tidb-cluster-release/data.tf +++ b/deploy/modules/share/tidb-cluster-release/data.tf @@ -5,7 +5,7 @@ data "external" "tidb_hostname" { } data "external" "monitor_hostname" { - depends_on = [helm_release.tidb-cluster] + depends_on = [helm_release.tidb-cluster, null_resource.wait-mlb-ip] working_dir = path.cwd program = ["bash", "-c", "kubectl --kubeconfig ${var.kubeconfig_filename} get svc -n ${var.cluster_name} ${var.cluster_name}-grafana -o json | jq '.status.loadBalancer.ingress[0]'"] } diff --git a/deploy/modules/share/tidb-cluster-release/main.tf b/deploy/modules/share/tidb-cluster-release/main.tf index d4b0639464..5908a8a660 100644 --- a/deploy/modules/share/tidb-cluster-release/main.tf +++ b/deploy/modules/share/tidb-cluster-release/main.tf @@ -161,3 +161,25 @@ EOS } } } + +resource "null_resource" "wait-mlb-ip" { + depends_on = [ + helm_release.tidb-cluster + ] + provisioner "local-exec" { + interpreter = ["bash", "-c"] + working_dir = path.cwd + command = <