Skip to content

Commit

Permalink
cherry pick pingcap#3613 to release-1.1
Browse files Browse the repository at this point in the history
Signed-off-by: ti-srebot <[email protected]>
  • Loading branch information
dragonly authored and ti-srebot committed Dec 21, 2020
1 parent 070ed66 commit 2a3e387
Show file tree
Hide file tree
Showing 50 changed files with 98 additions and 61 deletions.
16 changes: 8 additions & 8 deletions charts/tidb-cluster/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ services:
type: ClusterIP

discovery:
image: pingcap/tidb-operator:v1.1.7
image: pingcap/tidb-operator:v1.1.8
imagePullPolicy: IfNotPresent
resources:
limits:
Expand Down Expand Up @@ -108,7 +108,7 @@ pd:
# annotations: {} "<the default name will be used>"
# portName: "client"
replicas: 3
image: pingcap/pd:v4.0.8
image: pingcap/pd:v4.0.9
# 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.
Expand Down Expand Up @@ -255,7 +255,7 @@ tikv:
# we can only set capacity in tikv.resources.limits.storage.

replicas: 3
image: pingcap/tikv:v4.0.8
image: pingcap/tikv:v4.0.9
# 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.
Expand Down Expand Up @@ -352,7 +352,7 @@ tidb:
# initSqlConfigMapName: tidb-initsql
# initSql: |-
# create database app;
image: pingcap/tidb:v4.0.8
image: pingcap/tidb:v4.0.9
# Image pull policy.
imagePullPolicy: IfNotPresent

Expand Down Expand Up @@ -506,7 +506,7 @@ monitor:
storageClassName: local-storage
storage: 10Gi
initializer:
image: pingcap/tidb-monitor-initializer:v4.0.8
image: pingcap/tidb-monitor-initializer:v4.0.9
imagePullPolicy: IfNotPresent
config:
K8S_PROMETHEUS_URL: http://prometheus-k8s.monitoring.svc:9090
Expand Down Expand Up @@ -592,7 +592,7 @@ binlog:
pump:
create: false
replicas: 1
image: pingcap/tidb-binlog:v4.0.8
image: pingcap/tidb-binlog:v4.0.9
imagePullPolicy: IfNotPresent
logLevel: info
# storageClassName is a StorageClass provides a way for administrators to describe the "classes" of storage they offer.
Expand Down Expand Up @@ -661,7 +661,7 @@ binlog:

drainer:
create: false
image: pingcap/tidb-binlog:v4.0.8
image: pingcap/tidb-binlog:v4.0.9
imagePullPolicy: IfNotPresent
logLevel: info
# storageClassName is a StorageClass provides a way for administrators to describe the "classes" of storage they offer.
Expand Down Expand Up @@ -826,7 +826,7 @@ scheduledBackup:

importer:
create: false
image: pingcap/tidb-lightning:v4.0.8
image: pingcap/tidb-lightning:v4.0.9
imagePullPolicy: IfNotPresent
storageClassName: local-storage
storage: 200Gi
Expand Down
2 changes: 1 addition & 1 deletion charts/tidb-drainer/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ timezone: UTC

# clusterName is the TiDB cluster name that should backup from or restore to.
clusterName: demo
clusterVersion: v4.0.8
clusterVersion: v4.0.9

baseImage: pingcap/tidb-binlog
imagePullPolicy: IfNotPresent
Expand Down
2 changes: 1 addition & 1 deletion charts/tidb-lightning/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# timezone is the default system timzone
timezone: UTC

image: pingcap/tidb-lightning:v4.0.8
image: pingcap/tidb-lightning:v4.0.9
imagePullPolicy: IfNotPresent
# imagePullSecrets: []

Expand Down
4 changes: 2 additions & 2 deletions charts/tidb-operator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ rbac:
timezone: UTC

# operatorImage is TiDB Operator image
operatorImage: pingcap/tidb-operator:v1.1.7
operatorImage: pingcap/tidb-operator:v1.1.8
imagePullPolicy: IfNotPresent
# imagePullSecrets: []

# tidbBackupManagerImage is tidb backup manager image
tidbBackupManagerImage: pingcap/tidb-backup-manager:v1.1.7
tidbBackupManagerImage: pingcap/tidb-backup-manager:v1.1.8

#
# Enable or disable tidb-operator features:
Expand Down
2 changes: 1 addition & 1 deletion charts/tikv-importer/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.8
image: pingcap/tidb-lightning:v4.0.9
imagePullPolicy: IfNotPresent
# imagePullSecrets: []

Expand Down
2 changes: 1 addition & 1 deletion deploy/aliyun/manifests/db-monitor.yaml.example
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ spec:
# requests:
# cpu: 50m
# memory: 64Mi
version: v4.0.8
version: v4.0.9
kubePrometheusURL: ""
nodeSelector: {}
persistent: true
Expand Down
2 changes: 1 addition & 1 deletion deploy/aliyun/manifests/db.yaml.example
Original file line number Diff line number Diff line change
Expand Up @@ -109,4 +109,4 @@ spec:
timezone: UTC
tlsCluster:
enabled: false
version: v4.0.8
version: v4.0.9
4 changes: 2 additions & 2 deletions deploy/aliyun/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ variable "bastion_cpu_core_count" {

variable "operator_version" {
type = string
default = "v1.1.7"
default = "v1.1.8"
}

variable "operator_helm_values" {
Expand All @@ -36,7 +36,7 @@ variable "cluster_name" {

variable "tidb_version" {
description = "TiDB cluster version"
default = "v4.0.8"
default = "v4.0.9"
}
variable "tidb_cluster_chart_version" {
description = "tidb-cluster chart version"
Expand Down
2 changes: 1 addition & 1 deletion deploy/aws/manifests/db-monitor.yaml.example
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ spec:
# requests:
# cpu: 50m
# memory: 64Mi
version: v4.0.8
version: v4.0.9
kubePrometheusURL: ""
nodeSelector: {}
persistent: true
Expand Down
2 changes: 1 addition & 1 deletion deploy/aws/manifests/db.yaml.example
Original file line number Diff line number Diff line change
Expand Up @@ -109,4 +109,4 @@ spec:
timezone: UTC
tlsCluster:
enabled: false
version: v4.0.8
version: v4.0.9
4 changes: 2 additions & 2 deletions deploy/aws/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ variable "eks_version" {

variable "operator_version" {
description = "TiDB operator version"
default = "v1.1.7"
default = "v1.1.8"
}

variable "operator_values" {
Expand Down Expand Up @@ -80,7 +80,7 @@ variable "bastion_instance_type" {

# For aws tutorials compatiablity
variable "default_cluster_version" {
default = "v4.0.8"
default = "v4.0.9"
}

variable "default_cluster_pd_count" {
Expand Down
2 changes: 1 addition & 1 deletion deploy/gcp/manifests/db-monitor.yaml.example
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ spec:
# requests:
# cpu: 50m
# memory: 64Mi
version: v4.0.8
version: v4.0.9
kubePrometheusURL: ""
nodeSelector: {}
persistent: true
Expand Down
2 changes: 1 addition & 1 deletion deploy/gcp/manifests/db.yaml.example
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: TidbCluster
metadata:
name: CLUSTER_NAME
spec:
version: v4.0.8
version: v4.0.9
timezone: UTC
pvReclaimPolicy: Retain
schedulerName: tidb-scheduler
Expand Down
4 changes: 2 additions & 2 deletions deploy/gcp/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ variable "node_locations" {

variable "tidb_version" {
description = "TiDB version"
default = "v4.0.8"
default = "v4.0.9"
}

variable "tidb_operator_version" {
default = "v1.1.7"
default = "v1.1.8"
}

variable "tidb_operator_chart_version" {
Expand Down
2 changes: 1 addition & 1 deletion deploy/modules/aliyun/tidb-cluster/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ variable "image_id" {

variable "tidb_version" {
description = "TiDB cluster version"
default = "v4.0.8"
default = "v4.0.9"
}

variable "tidb_cluster_chart_version" {
Expand Down
2 changes: 1 addition & 1 deletion deploy/modules/aws/tidb-cluster/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ variable "cluster_name" {

variable "cluster_version" {
type = string
default = "v4.0.8"
default = "v4.0.9"
}

variable "ssh_key_name" {
Expand Down
2 changes: 1 addition & 1 deletion deploy/modules/gcp/tidb-cluster/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ variable "tidb_operator_id" {
variable "cluster_name" {}
variable "cluster_version" {
description = "The TiDB cluster version"
default = "v4.0.8"
default = "v4.0.9"
}
variable "tidb_cluster_chart_version" {
description = "The TiDB cluster chart version"
Expand Down
2 changes: 1 addition & 1 deletion deploy/modules/share/tidb-cluster-release/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ variable "cluster_name" {

variable "cluster_version" {
type = string
default = "v4.0.8"
default = "v4.0.9"
}

variable "pd_count" {
Expand Down
2 changes: 1 addition & 1 deletion examples/advanced-statefulset/tidb-cluster-scaled.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
tikv.tidb.pingcap.com/delete-slots: '[1]'
name: asts
spec:
version: v4.0.8
version: v4.0.9
timezone: UTC
pvReclaimPolicy: Retain
enableDynamicConfiguration: true
Expand Down
2 changes: 1 addition & 1 deletion examples/advanced-statefulset/tidb-cluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: TidbCluster
metadata:
name: asts
spec:
version: v4.0.8
version: v4.0.9
timezone: UTC
pvReclaimPolicy: Retain
enableDynamicConfiguration: true
Expand Down
2 changes: 1 addition & 1 deletion examples/advanced/tidb-cluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ spec:
#######################

## TiDB cluster version
version: "v4.0.8"
version: "v4.0.9"

## Time zone of TiDB cluster Pods
timezone: UTC
Expand Down
2 changes: 1 addition & 1 deletion examples/auto-scale/tidb-cluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: TidbCluster
metadata:
name: auto-scaling-demo
spec:
version: v4.0.8
version: v4.0.9
timezone: UTC
pvReclaimPolicy: Retain
enableDynamicConfiguration: true
Expand Down
2 changes: 1 addition & 1 deletion examples/auto-scale/tidb-monitor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ spec:
version: 6.1.6
initializer:
baseImage: pingcap/tidb-monitor-initializer
version: v4.0.8
version: v4.0.9
reloader:
baseImage: pingcap/tidb-monitor-reloader
version: v1.0.1
Expand Down
2 changes: 1 addition & 1 deletion examples/aws/tidb-cluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: TidbCluster
metadata:
name: basic
spec:
version: v4.0.8
version: v4.0.9
timezone: UTC
configUpdateStrategy: RollingUpdate
pvReclaimPolicy: Retain
Expand Down
2 changes: 1 addition & 1 deletion examples/aws/tidb-monitor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ spec:
initializer:
baseImage: pingcap/tidb-monitor-initializer
imagePullPolicy: IfNotPresent
version: v4.0.8
version: v4.0.9
kubePrometheusURL: ""
persistent: true
prometheus:
Expand Down
2 changes: 1 addition & 1 deletion examples/basic-cn/tidb-cluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ kind: TidbCluster
metadata:
name: basic
spec:
version: v4.0.8
version: v4.0.9
timezone: UTC
pvReclaimPolicy: Retain
enableDynamicConfiguration: true
Expand Down
2 changes: 1 addition & 1 deletion examples/basic-cn/tidb-monitor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ spec:
version: 6.1.6
initializer:
baseImage: registry.cn-beijing.aliyuncs.com/tidb/tidb-monitor-initializer
version: v4.0.8
version: v4.0.9
reloader:
baseImage: registry.cn-beijing.aliyuncs.com/tidb/tidb-monitor-reloader
version: v1.0.1
Expand Down
2 changes: 1 addition & 1 deletion examples/basic/tidb-cluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ kind: TidbCluster
metadata:
name: basic
spec:
version: v4.0.8
version: v4.0.9
timezone: UTC
pvReclaimPolicy: Retain
enableDynamicConfiguration: true
Expand Down
2 changes: 1 addition & 1 deletion examples/basic/tidb-monitor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ spec:
version: 6.1.6
initializer:
baseImage: pingcap/tidb-monitor-initializer
version: v4.0.8
version: v4.0.9
reloader:
baseImage: pingcap/tidb-monitor-reloader
version: v1.0.1
Expand Down
2 changes: 1 addition & 1 deletion examples/gcp/tidb-cluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: TidbCluster
metadata:
name: basic
spec:
version: v4.0.8
version: v4.0.9
timezone: UTC
configUpdateStrategy: RollingUpdate
pvReclaimPolicy: Retain
Expand Down
2 changes: 1 addition & 1 deletion examples/gcp/tidb-monitor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ spec:
initializer:
baseImage: pingcap/tidb-monitor-initializer
imagePullPolicy: IfNotPresent
version: v4.0.8
version: v4.0.9
kubePrometheusURL: ""
persistent: true
prometheus:
Expand Down
4 changes: 2 additions & 2 deletions examples/heterogeneous-tls/heterogeneous-cluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ spec:
enabled: true
configUpdateStrategy: RollingUpdate
enableDynamicConfiguration: true
version: v4.0.8
version: v4.0.9
timezone: UTC
pvReclaimPolicy: Retain
discovery: {}
Expand Down Expand Up @@ -38,7 +38,7 @@ spec:
enabled: true
tiflash:
baseImage: pingcap/tiflash
version: v4.0.8
version: v4.0.9
maxFailoverCount: 1
replicas: 1
storageClaims:
Expand Down
2 changes: 1 addition & 1 deletion examples/heterogeneous-tls/tidb-cluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ metadata:
spec:
tlsCluster:
enabled: true
version: v4.0.8
version: v4.0.9
timezone: UTC
pvReclaimPolicy: Retain
enableDynamicConfiguration: true
Expand Down
Loading

0 comments on commit 2a3e387

Please sign in to comment.