Automated cherry pick of #1045: tidb lb is empty after terraform apply (

#1052)

* tidb lb is empty after terraform apply

* update scheduler image for ali and lb key for gcp

* wait for monitoring lb

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"
   }
-}
+}

deploy/modules/gcp/tidb-cluster/main.tf

@@ -136,6 +136,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]
+  service_ingress_key        = "ip"
 }
 
 resource "null_resource" "wait-lb-ip" {

deploy/modules/share/tidb-cluster-release/data.tf

@@ -1,11 +1,11 @@
 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]'"]
 }
 
 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]'"]
 }

deploy/modules/share/tidb-cluster-release/main.tf

@@ -139,3 +139,47 @@ EOS
     }
   }
 }
+
+resource "null_resource" "wait-lb-ip" {
+  depends_on = [
+    helm_release.tidb-cluster
+  ]
+  provisioner "local-exec" {
+    interpreter = ["bash", "-c"]
+    working_dir = path.cwd
+    command     = <<EOS
+set -euo pipefail
+
+until kubectl get svc -n ${var.cluster_name} ${var.cluster_name}-tidb -o json | jq '.status.loadBalancer.ingress[0]' | grep "${var.service_ingress_key}"; do
+  echo "Wait for TiDB internal loadbalancer IP"
+  sleep 5
+done
+EOS
+
+    environment = {
+      KUBECONFIG = var.kubeconfig_filename
+    }
+  }
+}
+
+resource "null_resource" "wait-mlb-ip" {
+  depends_on = [
+    helm_release.tidb-cluster
+  ]
+  provisioner "local-exec" {
+    interpreter = ["bash", "-c"]
+    working_dir = path.cwd
+    command     = <<EOS
+set -euo pipefail
+
+until kubectl get svc -n ${var.cluster_name} ${var.cluster_name}-grafana -o json | jq '.status.loadBalancer.ingress[0]' | grep "${var.service_ingress_key}"; do
+  echo "Wait for TiDB monitoring internal loadbalancer IP"
+  sleep 5
+done
+EOS
+
+    environment = {
+      KUBECONFIG = var.kubeconfig_filename
+    }
+  }
+}