Merge branch 'master' into yinliang/modify-br-tls

pingcap · Mar 23, 2020 · 6aea916 · 6aea916
2 parents 5b66518 + b8ed43e
commit 6aea916
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/charts/tidb-cluster/templates/tidb-initializer-job.yaml b/charts/tidb-cluster/templates/tidb-initializer-job.yaml
@@ -44,6 +44,8 @@ spec:
  fi
  done
  echo "info: successfully connected to $host:$port, able to initialize TiDB now"
+ resources:
+{{ toYaml .Values.tidb.initializer.resources | indent 10 }}
  containers:
  - name: mysql-client
  image: {{ .Values.mysqlClient.image }}

diff --git a/charts/tidb-cluster/values.yaml b/charts/tidb-cluster/values.yaml
@@ -448,12 +448,12 @@ tidb:
 
  initializer:
  resources: {}
- # limits:
- # cpu: 100m
- # memory: 100Mi
- # requests:
- # cpu: 100m
- # memory: 100Mi
+ #  limits:
+ #  cpu: 100m
+ #  memory: 100Mi
+ #  requests:
+ #  cpu: 100m
+ #  memory: 100Mi
 
  # tidb plugin configuration
  plugin:

diff --git a/deploy/modules/aliyun/tidb-operator/versions.tf b/deploy/modules/aliyun/tidb-operator/versions.tf
@@ -2,7 +2,7 @@
 terraform {
  required_version = ">= 0.12"
  required_providers {
- alicloud = "~> 1.56"
+ alicloud = ">= 1.56, < 1.75"
  external = "~> 1.2"
  helm = "~> 0.10"
  null = "~> 2.1"