Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

upgrade default TiDB version to v3.0.5 (cherry-pick #1132) #1179

Merged
merged 4 commits into from
Nov 21, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ The `monitor` section in new `values.yaml`:
monitor:
create: true
initializer:
image: pingcap/tidb-monitor-initializer:v3.0.1
image: pingcap/tidb-monitor-initializer:v3.0.5
imagePullPolicy: IfNotPresent
reloader:
create: true
Expand Down
17 changes: 7 additions & 10 deletions charts/tidb-cluster/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ pd:
location-labels = ["region", "zone", "rack", "host"]

replicas: 3
image: pingcap/pd:v3.0.4
image: pingcap/pd:v3.0.5
# 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 @@ -221,7 +221,7 @@ tikv:
# we can only set capacity in tikv.resources.limits.storage.

replicas: 3
image: pingcap/tikv:v3.0.4
image: pingcap/tikv:v3.0.5
# 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 @@ -311,7 +311,7 @@ tidb:
# initSqlConfigMapName: tidb-initsql
# initSql: |-
# create database app;
image: pingcap/tidb:v3.0.4
image: pingcap/tidb:v3.0.5
# Image pull policy.
imagePullPolicy: IfNotPresent

Expand All @@ -323,7 +323,6 @@ tidb:
# cpu: 12000m
# memory: 12Gi


## affinity defines tikv scheduling rules,affinity default settings is empty.
## please read the affinity document before set your scheduling rule:
## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
Expand Down Expand Up @@ -354,15 +353,13 @@ tidb:
# # when the kubelet is configured to allow unsafe sysctls
# - name: net.core.somaxconn
# value: "32768"

# # Load balancers usually have an idle timeout (eg. AWS NLB idle timeout is 350),
# # the tcp_keepalive_time must be set to lower than LB idle timeout.
# - name: net.ipv4.tcp_keepalive_time
# value: "300"
# - name: net.ipv4.tcp_keepalive_intvl
# value: "75"


# Specify the priorityClassName for TiDB Pod.
# refer to https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption/#how-to-use-priority-and-preemption
priorityClassName: ""
Expand Down Expand Up @@ -424,7 +421,7 @@ monitor:
storageClassName: local-storage
storage: 10Gi
initializer:
image: pingcap/tidb-monitor-initializer:v3.0.4
image: pingcap/tidb-monitor-initializer:v3.0.5
imagePullPolicy: IfNotPresent
config:
K8S_PROMETHEUS_URL: http://prometheus-k8s.monitoring.svc:9090
Expand Down Expand Up @@ -502,7 +499,7 @@ binlog:
pump:
create: false
replicas: 1
image: pingcap/tidb-binlog:v3.0.4
image: pingcap/tidb-binlog:v3.0.5
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 @@ -544,7 +541,7 @@ binlog:

drainer:
create: false
image: pingcap/tidb-binlog:v3.0.4
image: pingcap/tidb-binlog:v3.0.5
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 @@ -698,7 +695,7 @@ scheduledBackup:

importer:
create: false
image: pingcap/tidb-lightning:v3.0.4
image: pingcap/tidb-lightning:v3.0.5
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 @@ -7,7 +7,7 @@ timezone: UTC

# clusterName is the TiDB cluster name that should backup from or restore to.
clusterName: demo
clusterVersion: v3.0.4
clusterVersion: v3.0.5

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:v3.0.4
image: pingcap/tidb-lightning:v3.0.5
imagePullPolicy: IfNotPresent
service:
type: NodePort
Expand Down
2 changes: 1 addition & 1 deletion deploy/aliyun/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ variable "cluster_name" {

variable "tidb_version" {
description = "TiDB cluster version"
default = "v3.0.4"
default = "v3.0.5"
}
variable "tidb_cluster_chart_version" {
description = "tidb-cluster chart version"
Expand Down
2 changes: 1 addition & 1 deletion deploy/aws/clusters.tf
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ provider "helm" {
#
# # NOTE: cluster_name cannot be changed after creation
# cluster_name = "demo-cluster"
# cluster_version = "v3.0.4"
# cluster_version = "v3.0.5"
# ssh_key_name = module.key-pair.key_name
# pd_count = 1
# pd_instance_type = "t2.xlarge"
Expand Down
2 changes: 1 addition & 1 deletion deploy/aws/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ variable "bastion_instance_type" {

# For aws tutorials compatiablity
variable "default_cluster_version" {
default = "v3.0.4"
default = "v3.0.5"
}

variable "default_cluster_pd_count" {
Expand Down
2 changes: 1 addition & 1 deletion deploy/gcp/examples/tidb-customized.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ tikv_instance_type = "n1-highmem-4"
tidb_instance_type = "n1-standard-8"

# specify tidb version
tidb_version = "3.0.4"
tidb_version = "3.0.5"

# override tidb cluster values
override_values = <<EOF
Expand Down
2 changes: 1 addition & 1 deletion deploy/gcp/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ variable "node_locations" {

variable "tidb_version" {
description = "TiDB version"
default = "v3.0.4"
default = "v3.0.5"
}

variable "tidb_operator_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 = "v3.0.4"
default = "v3.0.5"
}

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 = "v3.0.4"
default = "v3.0.5"
}
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 = "v3.0.4"
default = "v3.0.5"
}

variable "pd_count" {
Expand Down
12 changes: 6 additions & 6 deletions images/tidb-operator-e2e/tidb-cluster-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ discovery:

pd:
replicas: 3
image: pingcap/pd:v3.0.4
image: pingcap/pd:v3.0.5
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 @@ -81,7 +81,7 @@ pd:

tikv:
replicas: 3
image: pingcap/tikv:v3.0.4
image: pingcap/tikv:v3.0.5
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 @@ -134,7 +134,7 @@ tidb:
# initSql is the SQL statements executed after the TiDB cluster is bootstrapped.
# initSql: |-
# create database app;
image: pingcap/tidb:v3.0.4
image: pingcap/tidb:v3.0.5
imagePullPolicy: IfNotPresent
logLevel: info
resources:
Expand Down Expand Up @@ -222,7 +222,7 @@ monitor:

fullbackup:
create: false
binlogImage: pingcap/tidb-binlog:v3.0.4
binlogImage: pingcap/tidb-binlog:v3.0.5
binlogImagePullPolicy: IfNotPresent
# https://github.com/tennix/tidb-cloud-backup
mydumperImage: pingcap/tidb-cloud-backup:20190610
Expand Down Expand Up @@ -263,7 +263,7 @@ binlog:
pump:
create: false
replicas: 1
image: pingcap/tidb-binlog:v3.0.4
image: pingcap/tidb-binlog:v3.0.5
imagePullPolicy: IfNotPresent
logLevel: info
# storageClassName is a StorageClass provides a way for administrators to describe the "classes" of storage they offer.
Expand All @@ -280,7 +280,7 @@ binlog:

drainer:
create: false
image: pingcap/tidb-binlog:v3.0.4
image: pingcap/tidb-binlog:v3.0.5
imagePullPolicy: IfNotPresent
logLevel: info
# storageClassName is a StorageClass provides a way for administrators to describe the "classes" of storage they offer.
Expand Down
2 changes: 1 addition & 1 deletion tests/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ func NewConfig() (*Config, error) {
flag.StringVar(&cfg.configFile, "config", "", "Config file")
flag.StringVar(&cfg.LogDir, "log-dir", "/logDir", "log directory")
flag.IntVar(&cfg.FaultTriggerPort, "fault-trigger-port", 23332, "the http port of fault trigger service")
flag.StringVar(&cfg.TidbVersions, "tidb-versions", "v3.0.2,v3.0.3,v3.0.4", "tidb versions")
flag.StringVar(&cfg.TidbVersions, "tidb-versions", "v3.0.2,v3.0.3,v3.0.4,v3.0.5", "tidb versions")
flag.StringVar(&cfg.TestApiserverImage, "test-apiserver-image", "pingcap/test-apiserver:latest", "test-apiserver image")
flag.StringVar(&cfg.OperatorTag, "operator-tag", "master", "operator tag used to choose charts")
flag.StringVar(&cfg.OperatorImage, "operator-image", "pingcap/tidb-operator:latest", "operator image")
Expand Down
2 changes: 1 addition & 1 deletion tests/manifests/e2e/e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ spec:
- --operator-tag=e2e
- --operator-image=localhost:5000/pingcap/tidb-operator:latest
- --test-apiserver-image=localhost:5000/pingcap/test-apiserver:latest
- --tidb-versions=v3.0.2,v3.0.3,v3.0.4
- --tidb-versions=v3.0.2,v3.0.3,v3.0.4,v3.0.5
- --chart-dir=/charts
- -v=4
volumeMounts:
Expand Down