Merge branch 'master' into 1913

pingcap · Mar 23, 2020 · 3c1a11f · 3c1a11f
2 parents 9dfa370 + ea6b6a7
commit 3c1a11f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 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: