From 9cd017d0fc40315db1947e7afac949967e290b48 Mon Sep 17 00:00:00 2001 From: Song Date: Wed, 13 Nov 2019 11:14:50 +0800 Subject: [PATCH 1/3] upgrade default TiDB version to v3.0.5 (#1132) --- CHANGELOG.md | 2 +- charts/tidb-cluster/values.yaml | 41 ++++++++------ deploy/aliyun/variables.tf | 2 +- deploy/aws/clusters.tf | 2 +- deploy/aws/variables.tf | 2 +- deploy/gcp/variables.tf | 2 +- deploy/modules/aws/tidb-cluster/variables.tf | 2 +- deploy/modules/gcp/tidb-cluster/variables.tf | 2 +- .../share/tidb-cluster-release/variables.tf | 2 +- .../tidb-cluster-values.yaml | 38 ++++++++----- tests/config.go | 4 ++ tests/manifests/e2e/e2e.yaml | 56 +++++++++---------- 12 files changed, 86 insertions(+), 69 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5c38b4ecbf..6145524986 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/charts/tidb-cluster/values.yaml b/charts/tidb-cluster/values.yaml index 166b0407dd..6799012e8b 100644 --- a/charts/tidb-cluster/values.yaml +++ b/charts/tidb-cluster/values.yaml @@ -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. @@ -171,7 +171,8 @@ pd: # Specify the security context of PD Pod. # refer to https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod - podSecurityContext: {} + podSecurityContext: + {} # sysctls: # # You can enable these kernel parameters tuning to improve TiDB performance, # # when the kubelet is configured to allow unsafe sysctls @@ -221,7 +222,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. @@ -265,7 +266,8 @@ tikv: # Specify the security context of TiKV Pod. # refer to https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod - podSecurityContext: {} + podSecurityContext: + {} # sysctls: # # You can enable these kernel parameters tuning to improve TiDB performance, # # when the kubelet is configured to allow unsafe sysctls @@ -311,7 +313,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 @@ -323,7 +325,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 @@ -348,13 +349,13 @@ tidb: # Specify the security context of TiDB Pod. # refer to https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod - podSecurityContext: {} + podSecurityContext: + {} # sysctls: # # You can enable these kernel parameters tuning to improve TiDB performance, # # 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 @@ -362,7 +363,6 @@ tidb: # - 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: "" @@ -372,7 +372,7 @@ tidb: type: NodePort exposeStatus: true # annotations: - # cloud.google.com/load-balancer-type: Internal + # cloud.google.com/load-balancer-type: Internal separateSlowLog: true slowLogTailer: image: busybox:1.26.2 @@ -424,7 +424,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 @@ -441,7 +441,8 @@ monitor: imagePullPolicy: IfNotPresent service: type: NodePort - resources: {} + resources: + {} # limits: # cpu: 50m # memory: 64Mi @@ -488,7 +489,8 @@ monitor: type: NodePort reserveDays: 12 # alertmanagerURL: "" - nodeSelector: {} + nodeSelector: + {} # kind: monitor # zone: cn-bj1-01,cn-bj1-02 # region: cn-bj1 @@ -502,7 +504,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. @@ -544,7 +546,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. @@ -579,7 +581,8 @@ binlog: # downstream storage, equal to --dest-db-type # valid values are "mysql", "file", "tidb", "kafka" destDBType: file - mysql: {} + mysql: + {} # host: "127.0.0.1" # user: "root" # password: "" @@ -587,7 +590,8 @@ binlog: # # Time and size limits for flash batch write # timeLimit: "30s" # sizeLimit: "100000" - kafka: {} + kafka: + {} # only need config one of zookeeper-addrs and kafka-addrs, will get kafka address if zookeeper-addrs is configed. # zookeeperAddrs: "127.0.0.1:2181" # kafkaAddrs: "127.0.0.1:9092" @@ -702,7 +706,8 @@ importer: imagePullPolicy: IfNotPresent storageClassName: local-storage storage: 200Gi - resources: {} + resources: + {} # limits: # cpu: 16000m # memory: 8Gi diff --git a/deploy/aliyun/variables.tf b/deploy/aliyun/variables.tf index 5920d252e2..852a3ca3b4 100644 --- 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 = "v3.0.4" + default = "v3.0.5" } variable "tidb_cluster_chart_version" { description = "tidb-cluster chart version" diff --git a/deploy/aws/clusters.tf b/deploy/aws/clusters.tf index 101406a8b8..1da87b0497 100644 --- a/deploy/aws/clusters.tf +++ b/deploy/aws/clusters.tf @@ -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" diff --git a/deploy/aws/variables.tf b/deploy/aws/variables.tf index 6f7f175671..95c0195113 100644 --- 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 = "v3.0.4" + default = "v3.0.5" } variable "default_cluster_pd_count" { diff --git a/deploy/gcp/variables.tf b/deploy/gcp/variables.tf index 8391abca2d..848980765b 100644 --- a/deploy/gcp/variables.tf +++ b/deploy/gcp/variables.tf @@ -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" { diff --git a/deploy/modules/aws/tidb-cluster/variables.tf b/deploy/modules/aws/tidb-cluster/variables.tf index 7730c4351c..82846cd87c 100644 --- 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 = "v3.0.4" + default = "v3.0.5" } variable "ssh_key_name" { diff --git a/deploy/modules/gcp/tidb-cluster/variables.tf b/deploy/modules/gcp/tidb-cluster/variables.tf index 9f523b878c..3a10c7a8c2 100644 --- 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 = "v3.0.4" + default = "v3.0.5" } 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 index 3c9d6e1a8a..8b74606a8b 100644 --- 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 = "v3.0.4" + default = "v3.0.5" } variable "pd_count" { diff --git a/images/tidb-operator-e2e/tidb-cluster-values.yaml b/images/tidb-operator-e2e/tidb-cluster-values.yaml index d2908b7131..960c30a1e3 100644 --- a/images/tidb-operator-e2e/tidb-cluster-values.yaml +++ b/images/tidb-operator-e2e/tidb-cluster-values.yaml @@ -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. @@ -64,7 +64,8 @@ pd: storage: 1Gi # nodeSelector is used for scheduling pod, # if nodeSelectorRequired is true, all the following labels must be matched - nodeSelector: {} + nodeSelector: + {} # kind: pd # # zone is comma separated availability zone list # zone: cn-bj1-01,cn-bj1-02 @@ -81,7 +82,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. @@ -102,7 +103,8 @@ tikv: # cpu: 12000m # memory: 24Gi storage: 10Gi - nodeSelector: {} + nodeSelector: + {} # kind: tikv # zone: cn-bj1-01,cn-bj1-02 # region: cn-bj1 @@ -134,7 +136,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: @@ -144,7 +146,8 @@ tidb: requests: {} # cpu: 12000m # memory: 12Gi - nodeSelector: {} + nodeSelector: + {} # kind: tidb # zone: cn-bj1-01,cn-bj1-02 # region: cn-bj1 @@ -159,7 +162,7 @@ tidb: type: NodePort exposeStatus: true # annotations: - # cloud.google.com/load-balancer-type: Internal + # cloud.google.com/load-balancer-type: Internal # mysqlClient is used to set password for TiDB # it must has Python MySQL client installed @@ -210,7 +213,8 @@ monitor: type: NodePort reserveDays: 12 # alertmanagerURL: "" - nodeSelector: {} + nodeSelector: + {} # kind: monitor # zone: cn-bj1-01,cn-bj1-02 # region: cn-bj1 @@ -222,7 +226,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 @@ -248,14 +252,16 @@ fullbackup: user: backup password: "Password here ..." # backup to gcp - gcp: {} + gcp: + {} # base64 format of the service account json file data # https://cloud.google.com/docs/authentication/production#obtaining_and_providing_service_account_credentials_manually # and then: cat credentials.json | base64 | tr -d '\n' # credentialsData: "" # bucket: "" # backup to ceph object storage - ceph: {} + ceph: + {} # endpoint: "" # bucket: "" @@ -263,7 +269,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. @@ -280,7 +286,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. @@ -308,7 +314,8 @@ binlog: # downstream storage, equal to --dest-db-type # valid values are "mysql", "pb", "kafka" destDBType: pb - mysql: {} + mysql: + {} # host: "127.0.0.1" # user: "root" # password: "" @@ -316,7 +323,8 @@ binlog: # # Time and size limits for flash batch write # timeLimit: "30s" # sizeLimit: "100000" - kafka: {} + kafka: + {} # only need config one of zookeeper-addrs and kafka-addrs, will get kafka address if zookeeper-addrs is configed. # zookeeperAddrs: "127.0.0.1:2181" # kafkaAddrs: "127.0.0.1:9092" diff --git a/tests/config.go b/tests/config.go index efc9cf52f4..01e45c034f 100644 --- a/tests/config.go +++ b/tests/config.go @@ -90,8 +90,12 @@ 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") +<<<<<<< HEAD flag.StringVar(&cfg.TidbVersions, "tidb-versions", "v3.0.2,v3.0.3,v3.0.4", "tidb versions") flag.StringVar(&cfg.TestApiserverImage, "test-apiserver-image", "pingcap/test-apiserver:latest", "test-apiserver image") +======= + flag.StringVar(&cfg.TidbVersions, "tidb-versions", "v3.0.2,v3.0.3,v3.0.4,v3.0.5", "tidb versions") +>>>>>>> 385da819... upgrade default TiDB version to v3.0.5 (#1132) 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") diff --git a/tests/manifests/e2e/e2e.yaml b/tests/manifests/e2e/e2e.yaml index 6a917a8548..b5773d30de 100644 --- a/tests/manifests/e2e/e2e.yaml +++ b/tests/manifests/e2e/e2e.yaml @@ -7,8 +7,8 @@ metadata: app: webhook-service spec: ports: - - port: 443 - targetPort: 443 + - port: 443 + targetPort: 443 selector: app: webhook --- @@ -17,9 +17,9 @@ apiVersion: rbac.authorization.k8s.io/v1beta1 metadata: name: tidb-operator-e2e subjects: -- kind: ServiceAccount - namespace: tidb-operator-e2e - name: tidb-operator-e2e + - kind: ServiceAccount + namespace: tidb-operator-e2e + name: tidb-operator-e2e roleRef: kind: ClusterRole name: cluster-admin @@ -41,28 +41,28 @@ metadata: spec: serviceAccount: tidb-operator-e2e containers: - - name: tidb-operator-e2e - image: localhost:5000/pingcap/tidb-operator-e2e:latest - imagePullPolicy: Always - command: - - /usr/local/bin/e2e - - --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 - - --chart-dir=/charts - - -v=4 - volumeMounts: - - mountPath: /logDir - name: logdir - env: - - name: NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace + - name: tidb-operator-e2e + image: localhost:5000/pingcap/tidb-operator-e2e:latest + imagePullPolicy: Always + command: + - /usr/local/bin/e2e + - --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,v3.0.5 + - --chart-dir=/charts + - -v=4 + volumeMounts: + - mountPath: /logDir + name: logdir + env: + - name: NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace volumes: - - name: logdir - hostPath: - path: /var/log - type: Directory + - name: logdir + hostPath: + path: /var/log + type: Directory restartPolicy: Never From 560b664976dda0544e04c2b48f2e32c3f65a80bb Mon Sep 17 00:00:00 2001 From: shonge Date: Wed, 20 Nov 2019 20:35:34 +0800 Subject: [PATCH 2/3] fix some indentation-bugs --- charts/tidb-cluster/values.yaml | 26 +++------ .../tidb-cluster-values.yaml | 26 +++------ tests/config.go | 6 +- tests/manifests/e2e/e2e.yaml | 56 +++++++++---------- 4 files changed, 47 insertions(+), 67 deletions(-) diff --git a/charts/tidb-cluster/values.yaml b/charts/tidb-cluster/values.yaml index 6799012e8b..2f2ffbbfdb 100644 --- a/charts/tidb-cluster/values.yaml +++ b/charts/tidb-cluster/values.yaml @@ -171,8 +171,7 @@ pd: # Specify the security context of PD Pod. # refer to https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod - podSecurityContext: - {} + podSecurityContext: {} # sysctls: # # You can enable these kernel parameters tuning to improve TiDB performance, # # when the kubelet is configured to allow unsafe sysctls @@ -266,8 +265,7 @@ tikv: # Specify the security context of TiKV Pod. # refer to https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod - podSecurityContext: - {} + podSecurityContext: {} # sysctls: # # You can enable these kernel parameters tuning to improve TiDB performance, # # when the kubelet is configured to allow unsafe sysctls @@ -349,8 +347,7 @@ tidb: # Specify the security context of TiDB Pod. # refer to https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod - podSecurityContext: - {} + podSecurityContext: {} # sysctls: # # You can enable these kernel parameters tuning to improve TiDB performance, # # when the kubelet is configured to allow unsafe sysctls @@ -372,7 +369,7 @@ tidb: type: NodePort exposeStatus: true # annotations: - # cloud.google.com/load-balancer-type: Internal + # cloud.google.com/load-balancer-type: Internal separateSlowLog: true slowLogTailer: image: busybox:1.26.2 @@ -441,8 +438,7 @@ monitor: imagePullPolicy: IfNotPresent service: type: NodePort - resources: - {} + resources: {} # limits: # cpu: 50m # memory: 64Mi @@ -489,8 +485,7 @@ monitor: type: NodePort reserveDays: 12 # alertmanagerURL: "" - nodeSelector: - {} + nodeSelector: {} # kind: monitor # zone: cn-bj1-01,cn-bj1-02 # region: cn-bj1 @@ -581,8 +576,7 @@ binlog: # downstream storage, equal to --dest-db-type # valid values are "mysql", "file", "tidb", "kafka" destDBType: file - mysql: - {} + mysql: {} # host: "127.0.0.1" # user: "root" # password: "" @@ -590,8 +584,7 @@ binlog: # # Time and size limits for flash batch write # timeLimit: "30s" # sizeLimit: "100000" - kafka: - {} + kafka: {} # only need config one of zookeeper-addrs and kafka-addrs, will get kafka address if zookeeper-addrs is configed. # zookeeperAddrs: "127.0.0.1:2181" # kafkaAddrs: "127.0.0.1:9092" @@ -706,8 +699,7 @@ importer: imagePullPolicy: IfNotPresent storageClassName: local-storage storage: 200Gi - resources: - {} + resources: {} # limits: # cpu: 16000m # memory: 8Gi diff --git a/images/tidb-operator-e2e/tidb-cluster-values.yaml b/images/tidb-operator-e2e/tidb-cluster-values.yaml index 960c30a1e3..85454e482d 100644 --- a/images/tidb-operator-e2e/tidb-cluster-values.yaml +++ b/images/tidb-operator-e2e/tidb-cluster-values.yaml @@ -64,8 +64,7 @@ pd: storage: 1Gi # nodeSelector is used for scheduling pod, # if nodeSelectorRequired is true, all the following labels must be matched - nodeSelector: - {} + nodeSelector: {} # kind: pd # # zone is comma separated availability zone list # zone: cn-bj1-01,cn-bj1-02 @@ -103,8 +102,7 @@ tikv: # cpu: 12000m # memory: 24Gi storage: 10Gi - nodeSelector: - {} + nodeSelector: {} # kind: tikv # zone: cn-bj1-01,cn-bj1-02 # region: cn-bj1 @@ -146,8 +144,7 @@ tidb: requests: {} # cpu: 12000m # memory: 12Gi - nodeSelector: - {} + nodeSelector: {} # kind: tidb # zone: cn-bj1-01,cn-bj1-02 # region: cn-bj1 @@ -162,7 +159,7 @@ tidb: type: NodePort exposeStatus: true # annotations: - # cloud.google.com/load-balancer-type: Internal + # cloud.google.com/load-balancer-type: Internal # mysqlClient is used to set password for TiDB # it must has Python MySQL client installed @@ -213,8 +210,7 @@ monitor: type: NodePort reserveDays: 12 # alertmanagerURL: "" - nodeSelector: - {} + nodeSelector: {} # kind: monitor # zone: cn-bj1-01,cn-bj1-02 # region: cn-bj1 @@ -252,16 +248,14 @@ fullbackup: user: backup password: "Password here ..." # backup to gcp - gcp: - {} + gcp: {} # base64 format of the service account json file data # https://cloud.google.com/docs/authentication/production#obtaining_and_providing_service_account_credentials_manually # and then: cat credentials.json | base64 | tr -d '\n' # credentialsData: "" # bucket: "" # backup to ceph object storage - ceph: - {} + ceph: {} # endpoint: "" # bucket: "" @@ -314,8 +308,7 @@ binlog: # downstream storage, equal to --dest-db-type # valid values are "mysql", "pb", "kafka" destDBType: pb - mysql: - {} + mysql: {} # host: "127.0.0.1" # user: "root" # password: "" @@ -323,8 +316,7 @@ binlog: # # Time and size limits for flash batch write # timeLimit: "30s" # sizeLimit: "100000" - kafka: - {} + kafka: {} # only need config one of zookeeper-addrs and kafka-addrs, will get kafka address if zookeeper-addrs is configed. # zookeeperAddrs: "127.0.0.1:2181" # kafkaAddrs: "127.0.0.1:9092" diff --git a/tests/config.go b/tests/config.go index 01e45c034f..c2ce76cbe1 100644 --- a/tests/config.go +++ b/tests/config.go @@ -90,12 +90,8 @@ 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") -<<<<<<< HEAD - flag.StringVar(&cfg.TidbVersions, "tidb-versions", "v3.0.2,v3.0.3,v3.0.4", "tidb versions") - flag.StringVar(&cfg.TestApiserverImage, "test-apiserver-image", "pingcap/test-apiserver:latest", "test-apiserver image") -======= flag.StringVar(&cfg.TidbVersions, "tidb-versions", "v3.0.2,v3.0.3,v3.0.4,v3.0.5", "tidb versions") ->>>>>>> 385da819... upgrade default TiDB version to v3.0.5 (#1132) + 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") flag.StringVar(&cfg.UpgradeOperatorTag, "upgrade-operator-tag", "", "upgrade operator tag used to choose charts") diff --git a/tests/manifests/e2e/e2e.yaml b/tests/manifests/e2e/e2e.yaml index b5773d30de..56793e6ea6 100644 --- a/tests/manifests/e2e/e2e.yaml +++ b/tests/manifests/e2e/e2e.yaml @@ -7,8 +7,8 @@ metadata: app: webhook-service spec: ports: - - port: 443 - targetPort: 443 + - port: 443 + targetPort: 443 selector: app: webhook --- @@ -17,9 +17,9 @@ apiVersion: rbac.authorization.k8s.io/v1beta1 metadata: name: tidb-operator-e2e subjects: - - kind: ServiceAccount - namespace: tidb-operator-e2e - name: tidb-operator-e2e +- kind: ServiceAccount + namespace: tidb-operator-e2e + name: tidb-operator-e2e roleRef: kind: ClusterRole name: cluster-admin @@ -41,28 +41,28 @@ metadata: spec: serviceAccount: tidb-operator-e2e containers: - - name: tidb-operator-e2e - image: localhost:5000/pingcap/tidb-operator-e2e:latest - imagePullPolicy: Always - command: - - /usr/local/bin/e2e - - --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,v3.0.5 - - --chart-dir=/charts - - -v=4 - volumeMounts: - - mountPath: /logDir - name: logdir - env: - - name: NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace + - name: tidb-operator-e2e + image: localhost:5000/pingcap/tidb-operator-e2e:latest + imagePullPolicy: Always + command: + - /usr/local/bin/e2e + - --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,v3.0.5 + - --chart-dir=/charts + - -v=4 + volumeMounts: + - mountPath: /logDir + name: logdir + env: + - name: NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace volumes: - - name: logdir - hostPath: - path: /var/log - type: Directory + - name: logdir + hostPath: + path: /var/log + type: Directory restartPolicy: Never From 82a09469bf9f64d8bc4f7395ae187f3299192ecc Mon Sep 17 00:00:00 2001 From: shonge Date: Wed, 20 Nov 2019 20:41:26 +0800 Subject: [PATCH 3/3] update drainer and lightning to v3.0.5 --- charts/tidb-cluster/values.yaml | 2 +- charts/tidb-drainer/values.yaml | 2 +- charts/tidb-lightning/values.yaml | 2 +- deploy/gcp/examples/tidb-customized.tfvars | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/tidb-cluster/values.yaml b/charts/tidb-cluster/values.yaml index 2f2ffbbfdb..1400bce829 100644 --- a/charts/tidb-cluster/values.yaml +++ b/charts/tidb-cluster/values.yaml @@ -695,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 diff --git a/charts/tidb-drainer/values.yaml b/charts/tidb-drainer/values.yaml index c6a93d79d6..c832dbcf2f 100644 --- a/charts/tidb-drainer/values.yaml +++ b/charts/tidb-drainer/values.yaml @@ -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 diff --git a/charts/tidb-lightning/values.yaml b/charts/tidb-lightning/values.yaml index 455a082960..c59e5ee0ea 100644 --- 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:v3.0.4 +image: pingcap/tidb-lightning:v3.0.5 imagePullPolicy: IfNotPresent service: type: NodePort diff --git a/deploy/gcp/examples/tidb-customized.tfvars b/deploy/gcp/examples/tidb-customized.tfvars index 25d3e89927..dc86910863 100644 --- a/deploy/gcp/examples/tidb-customized.tfvars +++ b/deploy/gcp/examples/tidb-customized.tfvars @@ -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 = <