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.

Sign up for GitHub

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

Jump to bottom

Upgrade default TiDB version to v3.0.4 #837

Merged
merged 8 commits into from
Oct 10, 2019
Merged

Upgrade default TiDB version to v3.0.4 #837

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
46fe959
Upgrade default TiDB version to v3.0.2
shonge Aug 28, 2019
8275ee4
Update tests/config.go
shonge Aug 28, 2019
0b33548
Upgrade default TiDB version to v3.0.4
shonge Oct 8, 2019
ea66b8e
Upgrade default TiDB version to v3.0.4
shonge Oct 8, 2019
cde7c48
Merge branch 'master' into tidb-3.0.2
shonge Oct 9, 2019
3dd24ab
Update tests/config.go
shonge Oct 9, 2019
9e4902c
Update tests/manifests/e2e/e2e.yaml
shonge Oct 9, 2019
c14ecd5
Merge branch 'master' into tidb-3.0.2
tennix Oct 10, 2019
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
16 changes: 8 additions & 8 deletions charts/tidb-cluster/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ pd:
location-labels = ["region", "zone", "rack", "host"]

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

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

Expand Down Expand Up @@ -397,8 +397,8 @@ monitor:
storageClassName: local-storage
storage: 10Gi
initializer:
image: pingcap/tidb-monitor-initializer:v3.0.1
imagePullPolicy: Always
image: pingcap/tidb-monitor-initializer:v3.0.4
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@qiffang there is no pingcap/tidb-monitor-initializer:v3.0.4 yet. PTAL

imagePullPolicy: IfNotPresent
config:
K8S_PROMETHEUS_URL: http://prometheus-k8s.monitoring.svc:9090
resources: {}
Expand Down Expand Up @@ -475,7 +475,7 @@ binlog:
pump:
create: false
replicas: 1
image: pingcap/tidb-binlog:v3.0.1
image: pingcap/tidb-binlog:v3.0.4
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 @@ -517,7 +517,7 @@ binlog:

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

importer:
create: false
image: pingcap/tidb-lightning:v3.0.1
image: pingcap/tidb-lightning:v3.0.4
imagePullPolicy: IfNotPresent
storageClassName: local-storage
storage: 200Gi
Expand Down
2 changes: 1 addition & 1 deletion charts/tidb-drainer/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

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

baseImage: pingcap/tidb-binlog
imagePullPolicy: IfNotPresent
Expand Down
2 changes: 1 addition & 1 deletion charts/tidb-lightning/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# This is a YAML-formatted file.
# Declare variables to be passed into your templates.

image: pingcap/tidb-lightning:v3.0.1
image: pingcap/tidb-lightning:v3.0.4
imagePullPolicy: IfNotPresent
service:
type: NodePort
Expand Down
2 changes: 1 addition & 1 deletion deploy/aliyun/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ variable "cluster_name" {

variable "tidb_version" {
description = "TiDB cluster version"
default = "v3.0.1"
default = "v3.0.4"
}
variable "tidb_cluster_chart_version" {
description = "tidb-cluster chart version"
Expand Down
2 changes: 1 addition & 1 deletion deploy/aws/clusters.tf
View file
Open in desktop
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.1"
# cluster_version = "v3.0.4"
# 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
View file
Open in desktop
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.1"
default = "v3.0.4"
}

variable "default_cluster_pd_count" {
Expand Down
2 changes: 1 addition & 1 deletion deploy/gcp/examples/tidb-customized.tfvars
View file
Open in desktop
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.2"
tidb_version = "3.0.4"

# override tidb cluster values
override_values = <<EOF
Expand Down
2 changes: 1 addition & 1 deletion deploy/gcp/variables.tf
View file
Open in desktop
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.1"
default = "v3.0.4"
}

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

variable "cluster_version" {
type = string
default = "v3.0.1"
default = "v3.0.4"
}

variable "ssh_key_name" {
Expand Down
2 changes: 1 addition & 1 deletion deploy/modules/gcp/tidb-cluster/variables.tf
View file
Open in desktop
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.1"
default = "v3.0.4"
}
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ variable "cluster_name" {

variable "cluster_version" {
type = string
default = "v3.0.1"
default = "v3.0.4"
}

variable "pd_count" {
Expand Down
12 changes: 6 additions & 6 deletions images/tidb-operator-e2e/tidb-cluster-values.yaml
View file
Open in desktop
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.1
image: pingcap/pd:v3.0.4
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.1
image: pingcap/tikv:v3.0.4
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.1
image: pingcap/tidb:v3.0.4
imagePullPolicy: IfNotPresent
logLevel: info
resources:
Expand Down Expand Up @@ -222,7 +222,7 @@ monitor:

fullbackup:
create: false
binlogImage: pingcap/tidb-binlog:v3.0.1
binlogImage: pingcap/tidb-binlog:v3.0.4
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.1
image: pingcap/tidb-binlog:v3.0.4
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.1
image: pingcap/tidb-binlog:v3.0.4
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,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.0,v3.0.1,v3.0.2", "tidb versions")
flag.StringVar(&cfg.TidbVersions, "tidb-versions", "v3.0.0,v3.0.1,v3.0.2,v3.0.3,v3.0.4", "tidb versions")
shonge marked this conversation as resolved.
Show resolved Hide resolved
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")
flag.StringVar(&cfg.UpgradeOperatorTag, "upgrade-operator-tag", "", "upgrade operator tag used to choose charts")
Expand Down
2 changes: 1 addition & 1 deletion tests/manifests/e2e/e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ spec:
- /usr/local/bin/e2e
- --operator-tag=e2e
- --operator-image=pingcap/tidb-operator:latest
- --tidb-versions=v3.0.0-beta.1,v3.0.1
- --tidb-versions=v3.0.1,v3.0.2,v3.0.3,v3.0.4
shonge marked this conversation as resolved.
Show resolved Hide resolved
- --chart-dir=/charts
volumeMounts:
- mountPath: /logDir
Expand Down