Merge branch 'release-1.0' into automated-cherry-pick-of-pingcap#1501-…

…release-1.0
weekface · Jan 15, 2020 · 21b976f · 21b976f
2 parents 3a4ecff + 982720c
commit 21b976f
Show file tree

Hide file tree

Showing 14 changed files with 74 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,60 @@
+# TiDB Operator v1.0.6 Release Notes
+
+## v1.0.6 What's New
+
+Action required: Users should migrate the configs in `values.yaml` of previous chart releases to the new `values.yaml` of the new chart. Otherwise, the monitor pods might fail when you upgrade the monitor with the new chart.
+
+For example, configs in the old `values.yaml` file:
+
+```
+monitor:
+  ...
+  initializer:
+    image: pingcap/tidb-monitor-initializer:v3.0.5
+    imagePullPolicy: IfNotPresent
+  ...
+```
+
+After migration, configs in the new `values.yaml` file should be as follows:
+
+```
+monitor:
+  ...
+  initializer:
+    image: pingcap/tidb-monitor-initializer:v3.0.5
+    imagePullPolicy: Always
+    config:
+      K8S_PROMETHEUS_URL: http://prometheus-k8s.monitoring.svc:9090
+  ...
+```
+
+### Monitor
+
+- Enable alert rule persistence ([#898](https://github.com/pingcap/tidb-operator/pull/898))
+- Add node & pod info in TiDB Grafana ([#885](https://github.com/pingcap/tidb-operator/pull/885))
+
+### TiDB Scheduler
+
+- Refine scheduler error messages ([#1373](https://github.com/pingcap/tidb-operator/pull/1373))
+
+### Compatibility
+
+- Fix the compatibility issue in Kubernetes v1.17 ([#1241](https://github.com/pingcap/tidb-operator/pull/1241))
+- Bind the `system:kube-scheduler` ClusterRole to the `tidb-scheduler` service account ([#1355](https://github.com/pingcap/tidb-operator/pull/1355))
+
+### TiKV Importer
+
+- Fix the default `tikv-importer` configuration ([#1415](https://github.com/pingcap/tidb-operator/pull/1415))
+
+### E2E
+
+- Ensure pods unaffected when upgrading ([#955](https://github.com/pingcap/tidb-operator/pull/955))
+
+### CI
+
+- Move the release CI script from Jenkins into the tidb-operator repository ([#1237](https://github.com/pingcap/tidb-operator/pull/1237))
+- Adjust the release CI script for the `release-1.0` branch ([#1320](https://github.com/pingcap/tidb-operator/pull/1320))
+
 # TiDB Operator v1.0.5 Release Notes
 
 ## v1.0.5 What's New

diff --git a/charts/tidb-cluster/values.yaml b/charts/tidb-cluster/values.yaml
@@ -32,7 +32,7 @@ services:
     type: ClusterIP
 
 discovery:
-  image: pingcap/tidb-operator:v1.0.5
+  image: pingcap/tidb-operator:v1.0.6
   imagePullPolicy: IfNotPresent
   resources:
     limits:

diff --git a/charts/tidb-operator/values.yaml b/charts/tidb-operator/values.yaml
@@ -12,7 +12,7 @@ rbac:
 timezone: UTC
 
 # operatorImage is TiDB Operator image
-operatorImage: pingcap/tidb-operator:v1.0.5
+operatorImage: pingcap/tidb-operator:v1.0.6
 imagePullPolicy: IfNotPresent
 
 defaultStorageClassName: local-storage

diff --git a/deploy/aliyun/variables.tf b/deploy/aliyun/variables.tf
@@ -9,8 +9,8 @@ variable "bastion_cpu_core_count" {
 }
 
 variable "operator_version" {
-  type = string
-  default = "v1.0.5"
+  type    = string
+  default = "v1.0.6"
 }
 
 variable "operator_helm_values" {
@@ -40,7 +40,7 @@ variable "tidb_version" {
 }
 variable "tidb_cluster_chart_version" {
   description = "tidb-cluster chart version"
-  default     = "v1.0.5"
+  default     = "v1.0.6"
 }
 
 variable "pd_count" {

diff --git a/deploy/aws/variables.tf b/deploy/aws/variables.tf
@@ -19,7 +19,7 @@ variable "eks_version" {
 
 variable "operator_version" {
   description = "TiDB operator version"
-  default     = "v1.0.5"
+  default     = "v1.0.6"
 }
 
 variable "operator_values" {

diff --git a/deploy/gcp/variables.tf b/deploy/gcp/variables.tf
@@ -16,7 +16,7 @@ variable "tidb_version" {
 }
 
 variable "tidb_operator_version" {
-  default = "v1.0.5"
+  default = "v1.0.6"
 }
 
 variable "tidb_operator_chart_version" {

diff --git a/deploy/modules/aliyun/tidb-cluster/variable.tf b/deploy/modules/aliyun/tidb-cluster/variable.tf
@@ -17,7 +17,7 @@ variable "tidb_version" {
 
 variable "tidb_cluster_chart_version" {
   description = "tidb-cluster chart version"
-  default     = "v1.0.5"
+  default     = "v1.0.6"
 }
 
 variable "pd_count" {

diff --git a/deploy/modules/aliyun/tidb-operator/variables.tf b/deploy/modules/aliyun/tidb-operator/variables.tf
@@ -21,8 +21,8 @@ variable "cluster_network_type" {
 }
 
 variable "operator_version" {
-  type = string
-  default = "v1.0.5"
+  type    = string
+  default = "v1.0.6"
 }
 
 variable "operator_helm_values" {

diff --git a/deploy/modules/aws/tidb-cluster/variables.tf b/deploy/modules/aws/tidb-cluster/variables.tf
@@ -1,6 +1,6 @@
 variable "tidb_cluster_chart_version" {
   description = "tidb-cluster chart version"
-  default     = "v1.0.5"
+  default     = "v1.0.6"
 }
 
 variable "create_tidb_cluster_release" {

diff --git a/deploy/modules/aws/tidb-operator/variables.tf b/deploy/modules/aws/tidb-operator/variables.tf
@@ -12,7 +12,7 @@ variable "eks_version" {
 variable "operator_version" {
   description = "TiDB Operator version"
   type        = string
-  default     = "v1.0.5"
+  default     = "v1.0.6"
 }
 
 variable "operator_helm_values" {

diff --git a/deploy/modules/gcp/tidb-cluster/variables.tf b/deploy/modules/gcp/tidb-cluster/variables.tf
@@ -5,7 +5,7 @@ variable "cluster_version" {
 }
 variable "tidb_cluster_chart_version" {
   description = "The TiDB cluster chart version"
-  default     = "v1.0.5"
+  default     = "v1.0.6"
 }
 variable "override_values" {
   description = "YAML formatted values that will be passed in to the tidb-cluster helm release"

diff --git a/deploy/modules/gcp/tidb-operator/variables.tf b/deploy/modules/gcp/tidb-operator/variables.tf
@@ -28,7 +28,7 @@ variable "gke_version" {
 variable "tidb_operator_version" {
   description = "TiDB Operator version"
   type        = string
-  default     = "v1.0.5"
+  default     = "v1.0.6"
 }
 
 variable "operator_helm_values" {

diff --git a/deploy/modules/share/tidb-cluster-release/variables.tf b/deploy/modules/share/tidb-cluster-release/variables.tf
@@ -5,7 +5,7 @@ variable "kubeconfig_filename" {
 
 variable "tidb_cluster_chart_version" {
   description = "tidb-cluster chart version"
-  default     = "v1.0.5"
+  default     = "v1.0.6"
 }
 
 variable "create" {

diff --git a/tests/manifests/stability/stability.yaml b/tests/manifests/stability/stability.yaml
@@ -47,8 +47,8 @@ spec:
     command:
     - /usr/local/bin/stability-test
     - --config=/etc/tidb-operator-stability/config.yaml
-    - --operator-image=pingcap/tidb-operator:v1.0.5
-    - --operator-tag=v1.0.5
+    - --operator-image=pingcap/tidb-operator:v1.0.6
+    - --operator-tag=v1.0.6
     - --slack-webhook-url=""
     volumeMounts:
     - mountPath: /logDir