pingcap · ti-srebot · Sep 16, 2020 · Sep 16, 2020
diff --git a/charts/tidb-cluster/values.yaml b/charts/tidb-cluster/values.yaml
@@ -108,7 +108,7 @@ pd:
     # annotations: {} "<the default name will be used>"
     # portName: "client"
   replicas: 3
-  image: pingcap/pd:v4.0.4
+  image: pingcap/pd:v4.0.6
   # storageClassName is a StorageClass provides a way for administrators to describe the "classes" of storage they offer.
   # different classes might map to quality-of-service levels, or to backup policies,
   # or to arbitrary policies determined by the cluster administrators.
@@ -255,7 +255,7 @@ tikv:
   # we can only set capacity in tikv.resources.limits.storage.
 
   replicas: 3
-  image: pingcap/tikv:v4.0.4
+  image: pingcap/tikv:v4.0.6
   # storageClassName is a StorageClass provides a way for administrators to describe the "classes" of storage they offer.
   # different classes might map to quality-of-service levels, or to backup policies,
   # or to arbitrary policies determined by the cluster administrators.
@@ -352,7 +352,7 @@ tidb:
   # initSqlConfigMapName: tidb-initsql
   # initSql: |-
   #   create database app;
-  image: pingcap/tidb:v4.0.4
+  image: pingcap/tidb:v4.0.6
   # Image pull policy.
   imagePullPolicy: IfNotPresent
 
@@ -506,7 +506,7 @@ monitor:
   storageClassName: local-storage
   storage: 10Gi
   initializer:
-    image: pingcap/tidb-monitor-initializer:v4.0.4
+    image: pingcap/tidb-monitor-initializer:v4.0.6
     imagePullPolicy: IfNotPresent
     config:
       K8S_PROMETHEUS_URL: http://prometheus-k8s.monitoring.svc:9090
@@ -592,7 +592,7 @@ binlog:
   pump:
     create: false
     replicas: 1
-    image: pingcap/tidb-binlog:v4.0.4
+    image: pingcap/tidb-binlog:v4.0.6
     imagePullPolicy: IfNotPresent
     logLevel: info
     # storageClassName is a StorageClass provides a way for administrators to describe the "classes" of storage they offer.
@@ -661,7 +661,7 @@ binlog:
 
   drainer:
     create: false
-    image: pingcap/tidb-binlog:v4.0.4
+    image: pingcap/tidb-binlog:v4.0.6
     imagePullPolicy: IfNotPresent
     logLevel: info
     # storageClassName is a StorageClass provides a way for administrators to describe the "classes" of storage they offer.
@@ -826,7 +826,7 @@ scheduledBackup:
 
 importer:
   create: false
-  image: pingcap/tidb-lightning:v4.0.4
+  image: pingcap/tidb-lightning:v4.0.6
   imagePullPolicy: IfNotPresent
   storageClassName: local-storage
   storage: 200Gi

diff --git a/charts/tidb-drainer/values.yaml b/charts/tidb-drainer/values.yaml
@@ -12,7 +12,7 @@ timezone: UTC
 
 # clusterName is the TiDB cluster name that should backup from or restore to.
 clusterName: demo
-clusterVersion: v4.0.4
+clusterVersion: v4.0.6
 
 baseImage: pingcap/tidb-binlog
 imagePullPolicy: IfNotPresent

diff --git a/charts/tidb-lightning/values.yaml b/charts/tidb-lightning/values.yaml
@@ -5,7 +5,7 @@
 # timezone is the default system timzone
 timezone: UTC
 
-image: pingcap/tidb-lightning:v4.0.4
+image: pingcap/tidb-lightning:v4.0.6
 imagePullPolicy: IfNotPresent
 # imagePullSecrets: []
 

diff --git a/charts/tikv-importer/values.yaml b/charts/tikv-importer/values.yaml
@@ -8,7 +8,7 @@ timezone: UTC
 # clusterName is the TiDB cluster name, if not specified, the chart release name will be used
 clusterName: demo
 
-image: pingcap/tidb-lightning:v4.0.4
+image: pingcap/tidb-lightning:v4.0.6
 imagePullPolicy: IfNotPresent
 # imagePullSecrets: []
 

diff --git a/deploy/aliyun/manifests/db-monitor.yaml.example b/deploy/aliyun/manifests/db-monitor.yaml.example
@@ -46,7 +46,7 @@ spec:
     #  requests:
     #    cpu: 50m
     #    memory: 64Mi
-    version: v4.0.4
+    version: v4.0.6
   kubePrometheusURL: ""
   nodeSelector: {}
   persistent: true

diff --git a/deploy/aliyun/manifests/db.yaml.example b/deploy/aliyun/manifests/db.yaml.example
@@ -109,4 +109,4 @@ spec:
   timezone: UTC
   tlsCluster:
     enabled: false
-  version: v4.0.4
+  version: v4.0.6
diff --git a/deploy/aliyun/variables.tf b/deploy/aliyun/variables.tf
@@ -36,7 +36,7 @@ variable "cluster_name" {
 
 variable "tidb_version" {
   description = "TiDB cluster version"
-  default     = "v4.0.4"
+  default     = "v4.0.6"
 }
 variable "tidb_cluster_chart_version" {
   description = "tidb-cluster chart version"

diff --git a/deploy/aws/manifests/db-monitor.yaml.example b/deploy/aws/manifests/db-monitor.yaml.example
@@ -44,7 +44,7 @@ spec:
     #  requests:
     #    cpu: 50m
     #    memory: 64Mi
-    version: v4.0.4
+    version: v4.0.6
   kubePrometheusURL: ""
   nodeSelector: {}
   persistent: true

diff --git a/deploy/aws/manifests/db.yaml.example b/deploy/aws/manifests/db.yaml.example
@@ -109,4 +109,4 @@ spec:
   timezone: UTC
   tlsCluster:
     enabled: false
-  version: v4.0.4
+  version: v4.0.6
diff --git a/deploy/aws/variables.tf b/deploy/aws/variables.tf
@@ -80,7 +80,7 @@ variable "bastion_instance_type" {
 
 # For aws tutorials compatiablity
 variable "default_cluster_version" {
-  default = "v4.0.4"
+  default = "v4.0.6"
 }
 
 variable "default_cluster_pd_count" {

diff --git a/deploy/gcp/manifests/db-monitor.yaml.example b/deploy/gcp/manifests/db-monitor.yaml.example
@@ -44,7 +44,7 @@ spec:
     #  requests:
     #    cpu: 50m
     #    memory: 64Mi
-    version: v4.0.4
+    version: v4.0.6
   kubePrometheusURL: ""
   nodeSelector: {}
   persistent: true

diff --git a/deploy/gcp/manifests/db.yaml.example b/deploy/gcp/manifests/db.yaml.example
@@ -3,7 +3,7 @@ kind: TidbCluster
 metadata:
   name: CLUSTER_NAME
 spec:
-  version: v4.0.4
+  version: v4.0.6
   timezone: UTC
   pvReclaimPolicy: Retain
   schedulerName: tidb-scheduler

diff --git a/deploy/gcp/variables.tf b/deploy/gcp/variables.tf
@@ -24,7 +24,7 @@ variable "node_locations" {
 
 variable "tidb_version" {
   description = "TiDB version"
-  default     = "v4.0.4"
+  default     = "v4.0.6"
 }
 
 variable "tidb_operator_version" {

diff --git a/deploy/modules/aliyun/tidb-cluster/variables.tf b/deploy/modules/aliyun/tidb-cluster/variables.tf
@@ -12,7 +12,7 @@ variable "image_id" {
 
 variable "tidb_version" {
   description = "TiDB cluster version"
-  default     = "v4.0.4"
+  default     = "v4.0.6"
 }
 
 variable "tidb_cluster_chart_version" {

diff --git a/deploy/modules/aws/tidb-cluster/variables.tf b/deploy/modules/aws/tidb-cluster/variables.tf
@@ -19,7 +19,7 @@ variable "cluster_name" {
 
 variable "cluster_version" {
   type    = string
-  default = "v4.0.4"
+  default = "v4.0.6"
 }
 
 variable "ssh_key_name" {

diff --git a/deploy/modules/gcp/tidb-cluster/variables.tf b/deploy/modules/gcp/tidb-cluster/variables.tf
@@ -9,7 +9,7 @@ variable "tidb_operator_id" {
 variable "cluster_name" {}
 variable "cluster_version" {
   description = "The TiDB cluster version"
-  default     = "v4.0.4"
+  default     = "v4.0.6"
 }
 variable "tidb_cluster_chart_version" {
   description = "The TiDB cluster chart version"

diff --git a/deploy/modules/share/tidb-cluster-release/variables.tf b/deploy/modules/share/tidb-cluster-release/variables.tf
@@ -20,7 +20,7 @@ variable "cluster_name" {
 
 variable "cluster_version" {
   type    = string
-  default = "v4.0.4"
+  default = "v4.0.6"
 }
 
 variable "pd_count" {

diff --git a/examples/advanced-statefulset/tidb-cluster-scaled.yaml b/examples/advanced-statefulset/tidb-cluster-scaled.yaml
@@ -5,7 +5,7 @@ metadata:
     tikv.tidb.pingcap.com/delete-slots: '[1]'
   name: asts
 spec:
-  version: v4.0.4
+  version: v4.0.6
   timezone: UTC
   pvReclaimPolicy: Delete
   pd:

diff --git a/examples/advanced-statefulset/tidb-cluster.yaml b/examples/advanced-statefulset/tidb-cluster.yaml
@@ -3,7 +3,7 @@ kind: TidbCluster
 metadata:
   name: asts
 spec:
-  version: v4.0.4
+  version: v4.0.6
   timezone: UTC
   pvReclaimPolicy: Delete
   pd:

diff --git a/examples/advanced/tidb-cluster.yaml b/examples/advanced/tidb-cluster.yaml
@@ -7,7 +7,7 @@ metadata:
 spec:
   # ** Basic Configuration **
   # TiDB cluster version
-  version: "v4.0.4"
+  version: "v4.0.6"
 
   # Time zone of TiDB cluster Pods
   timezone: UTC

diff --git a/examples/auto-scale/tidb-cluster.yaml b/examples/auto-scale/tidb-cluster.yaml
@@ -3,7 +3,7 @@ kind: TidbCluster
 metadata:
   name: auto-scaling-demo
 spec:
-  version: v4.0.4
+  version: v4.0.6
   timezone: UTC
   pvReclaimPolicy: Delete
   pd:

diff --git a/examples/auto-scale/tidb-monitor.yaml b/examples/auto-scale/tidb-monitor.yaml
@@ -13,7 +13,7 @@ spec:
     version: 6.1.6
   initializer:
     baseImage: pingcap/tidb-monitor-initializer
-    version: v4.0.4
+    version: v4.0.6
   reloader:
     baseImage: pingcap/tidb-monitor-reloader
     version: v1.0.1

diff --git a/examples/aws/tidb-cluster.yaml b/examples/aws/tidb-cluster.yaml
@@ -3,7 +3,7 @@ kind: TidbCluster
 metadata:
   name: basic
 spec:
-  version: v4.0.4
+  version: v4.0.6
   timezone: UTC
   configUpdateStrategy: RollingUpdate
   pvReclaimPolicy: Retain

diff --git a/examples/aws/tidb-monitor.yaml b/examples/aws/tidb-monitor.yaml
@@ -30,7 +30,7 @@ spec:
   initializer:
     baseImage: pingcap/tidb-monitor-initializer
     imagePullPolicy: IfNotPresent
-    version: v4.0.4
+    version: v4.0.6
   kubePrometheusURL: ""
   persistent: true
   prometheus:

diff --git a/examples/basic-cn/tidb-cluster.yaml b/examples/basic-cn/tidb-cluster.yaml
@@ -6,7 +6,7 @@ kind: TidbCluster
 metadata:
   name: basic
 spec:
-  version: v4.0.4
+  version: v4.0.6
   timezone: UTC
   pvReclaimPolicy: Delete
   discovery: {}

diff --git a/examples/basic-cn/tidb-monitor.yaml b/examples/basic-cn/tidb-monitor.yaml
@@ -13,7 +13,7 @@ spec:
     version: 6.1.6
   initializer:
     baseImage: registry.cn-beijing.aliyuncs.com/tidb/tidb-monitor-initializer
-    version: v4.0.4
+    version: v4.0.6
   reloader:
     baseImage: registry.cn-beijing.aliyuncs.com/tidb/tidb-monitor-reloader
     version: v1.0.1

diff --git a/examples/basic/tidb-cluster.yaml b/examples/basic/tidb-cluster.yaml
@@ -6,7 +6,7 @@ kind: TidbCluster
 metadata:
   name: basic
 spec:
-  version: v4.0.4
+  version: v4.0.6
   timezone: UTC
   pvReclaimPolicy: Delete
   discovery: {}

diff --git a/examples/basic/tidb-monitor.yaml b/examples/basic/tidb-monitor.yaml
@@ -13,7 +13,7 @@ spec:
     version: 6.1.6
   initializer:
     baseImage: pingcap/tidb-monitor-initializer
-    version: v4.0.4
+    version: v4.0.6
   reloader:
     baseImage: pingcap/tidb-monitor-reloader
     version: v1.0.1

diff --git a/examples/gcp/tidb-cluster.yaml b/examples/gcp/tidb-cluster.yaml
@@ -3,7 +3,7 @@ kind: TidbCluster
 metadata:
   name: basic
 spec:
-  version: v4.0.4
+  version: v4.0.6
   timezone: UTC
   configUpdateStrategy: RollingUpdate
   pvReclaimPolicy: Retain

diff --git a/examples/gcp/tidb-monitor.yaml b/examples/gcp/tidb-monitor.yaml
@@ -30,7 +30,7 @@ spec:
   initializer:
     baseImage: pingcap/tidb-monitor-initializer
     imagePullPolicy: IfNotPresent
-    version: v4.0.4
+    version: v4.0.6
   kubePrometheusURL: ""
   persistent: true
   prometheus:

diff --git a/examples/heterogeneous/heterogeneous-cluster.yaml b/examples/heterogeneous/heterogeneous-cluster.yaml
@@ -7,7 +7,7 @@ metadata:
   name: heterogeneous
 spec:
   configUpdateStrategy: RollingUpdate
-  version: v4.0.4
+  version: v4.0.6
   timezone: UTC
   pvReclaimPolicy: Delete
   discovery: {}

diff --git a/examples/heterogeneous/tidb-cluster.yaml b/examples/heterogeneous/tidb-cluster.yaml
@@ -6,7 +6,7 @@ kind: TidbCluster
 metadata:
   name: basic
 spec:
-  version: v4.0.4
+  version: v4.0.6
   timezone: UTC
   pvReclaimPolicy: Delete
   imagePullPolicy: IfNotPresent

diff --git a/examples/heterogeneous/tidb-monitor.yaml b/examples/heterogeneous/tidb-monitor.yaml
@@ -0,0 +1,21 @@
+apiVersion: pingcap.com/v1alpha1
+kind: TidbMonitor
+metadata:
+  name: heterogeneous
+spec:
+  clusters:
+    - name: basic
+    - name: heterogeneous
+  prometheus:
+    baseImage: prom/prometheus
+    version: v2.11.1
+  grafana:
+    baseImage: grafana/grafana
+    version: 6.1.6
+  initializer:
+    baseImage: pingcap/tidb-monitor-initializer
+    version: v4.0.6
+  reloader:
+    baseImage: pingcap/tidb-monitor-reloader
+    version: v1.0.1
+  imagePullPolicy: IfNotPresent
diff --git a/examples/initialize/tidb-cluster.yaml b/examples/initialize/tidb-cluster.yaml
@@ -3,7 +3,7 @@ kind: TidbCluster
 metadata:
   name: initialize-demo
 spec:
-  version: v4.0.4
+  version: v4.0.6
   timezone: UTC
   pvReclaimPolicy: Delete
   pd:

diff --git a/examples/monitor-with-externalConfigMap/tidb-monitor.yaml b/examples/monitor-with-externalConfigMap/tidb-monitor.yaml
@@ -23,7 +23,7 @@ spec:
     version: 6.1.6
   initializer:
     baseImage: pingcap/tidb-monitor-initializer
-    version: v4.0.4
+    version: v4.0.6
   reloader:
     baseImage: pingcap/tidb-monitor-reloader
     version: v1.0.1

diff --git a/examples/selfsigned-tls/tidb-cluster.yaml b/examples/selfsigned-tls/tidb-cluster.yaml
@@ -3,7 +3,7 @@ kind: TidbCluster
 metadata:
   name: tls
 spec:
-  version: v4.0.4
+  version: v4.0.6
   timezone: UTC
   pvReclaimPolicy: Delete
   pd:

diff --git a/examples/tiflash/tidb-cluster.yaml b/examples/tiflash/tidb-cluster.yaml
@@ -70,4 +70,4 @@ spec:
       storage: 10Gi
     storageClassName: local-storage
   timezone: UTC
-  version: v4.0.4
+  version: v4.0.6
diff --git a/examples/tiflash/tidb-monitor.yaml b/examples/tiflash/tidb-monitor.yaml
@@ -15,7 +15,7 @@ spec:
       type: NodePort
   initializer:
     baseImage: pingcap/tidb-monitor-initializer
-    version: v4.0.4
+    version: v4.0.6
   reloader:
     baseImage: pingcap/tidb-monitor-reloader
     version: v1.0.1