pingcap · ran-huang · Sep 18, 2020 · Sep 18, 2020 · Sep 18, 2020 · Sep 18, 2020
diff --git a/en/TOC.md b/en/TOC.md
@@ -85,6 +85,7 @@
   - [Log Collection](logs-collection.md)
 + Release Notes
   + v1.1
+    - [1.1.5](releases/release-1.1.5.md)
     - [1.1.4](releases/release-1.1.4.md)
     - [1.1.3](releases/release-1.1.3.md)
     - [1.1.2](releases/release-1.1.2.md)

diff --git a/en/releases/release-1.1.5.md b/en/releases/release-1.1.5.md
@@ -0,0 +1,36 @@
+---
+title: TiDB Operator 1.1.5 Release Notes
+---
+
+# TiDB Operator 1.1.5 Release Notes
+
+Release date: September 18, 2020
+
+TiDB Operator version: 1.1.5
+
+## Compatibility Changes
+
+- If the TiFlash version is earlier than `v4.0.5`, please set `spec.tiflash.config.config.flash.service_addr: {clusterName}-tiflash-POD_NUM.{clusterName}-tiflash-peer.{namespace}.svc:3930` in the TidbCluster CR (`{clusterName}` and `{namespace}` need to be replaced with the real value) before upgrading TiDB Operator to v1.1.5 or later versions. When TiFlash is going to be upgraded to `v4.0.5` or later versions, please remove `spec.tiflash.config.config.flash.service_addr` in the TidbCluster CR at the same time ([#3191](https://github.com/pingcap/tidb-operator/pull/3191), [@DanielZhangQD](https://github.com/DanielZhangQD))
+
+## New Features
+
+- Support configuring `serviceAccount` for TiDB/Pump/PD ([#3246](https://github.com/pingcap/tidb-operator/pull/3246), [@july2993](https://github.com/july2993))
+- Support configuring `spec.tikv.config.log-format` and `spec.tikv.config.server.max-grpc-send-msg-len` ([#3199](https://github.com/pingcap/tidb-operator/pull/3199), [@kolbe](https://github.com/kolbe))
+- Support labels configuration for TiDB ([#3188](https://github.com/pingcap/tidb-operator/pull/3188), [@howardlau1999](https://github.com/howardlau1999))
+- Support recovery from failover for TiFlash and TiKV ([#3189](https://github.com/pingcap/tidb-operator/pull/3189), [@DanielZhangQD](https://github.com/DanielZhangQD))
+- Add `mountClusterClientSecret` configuration for PD and TiKV. If the config is set to `true`, TiDB Operator will mount the `${cluster_name}-cluster-client-secret` to the PD or TiKV containers ([#3282](https://github.com/pingcap/tidb-operator/pull/3282), [@DanielZhangQD](https://github.com/DanielZhangQD))
+
+## Improvements
+
+- Adapt TiDB/PD/TiKV configurations to v4.0.6 ([#3180](https://github.com/pingcap/tidb-operator/pull/3180), [@lichunzhu](https://github.com/lichunzhu))
+- Support mounting the cluster client certificate to PD pod ([#3248](https://github.com/pingcap/tidb-operator/pull/3248), [@weekface](https://github.com/weekface))
+- Scaling takes precedence over upgrading for TiFlash/PD/TiDB. This is to avoid that Pods cannot be scaled in case of upgrade failure ([#3187](https://github.com/pingcap/tidb-operator/pull/3187), [@lichunzhu](https://github.com/lichunzhu))
+- Support the `imagePullSecrets` configuration for Pump ([#3214](https://github.com/pingcap/tidb-operator/pull/3214), [@weekface](https://github.com/weekface))
+- Update the default configuration for TiFlash ([#3191](https://github.com/pingcap/tidb-operator/pull/3191), [@DanielZhangQD](https://github.com/DanielZhangQD))
+- Remove `ClusterRole` from TidbMonitor CR ([#3190](https://github.com/pingcap/tidb-operator/pull/3190), [@weekface](https://github.com/weekface))
+- Drainer that are deployed by Helm and exits normally will no longer be restarted ([#3151](https://github.com/pingcap/tidb-operator/pull/3151), [@lichunzhu](https://github.com/lichunzhu))
+- tidb-scheduler ha strategy takes failover pods into consideration ([#3171](https://github.com/pingcap/tidb-operator/pull/3171), [@cofyc](https://github.com/cofyc))
+
+## Bug Fixes
+
+- Fix the problem that the `Env` settings are ignored for the Grafana container in the TidbMonitor CR ([#3237](https://github.com/pingcap/tidb-operator/pull/3237), [@tirsen](https://github.com/tirsen))
diff --git a/zh/TOC.md b/zh/TOC.md
@@ -85,6 +85,7 @@
   - [日志收集](logs-collection.md)
 + 版本发布历史
   + v1.1
+    - [1.1.5](releases/release-1.1.5.md)
     - [1.1.4](releases/release-1.1.4.md)
     - [1.1.3](releases/release-1.1.3.md)
     - [1.1.2](releases/release-1.1.2.md)

diff --git a/zh/releases/release-1.1.5.md b/zh/releases/release-1.1.5.md
@@ -0,0 +1,36 @@
+---
+title: TiDB Operator 1.1.5 Release Notes
+---
+
+# TiDB Operator 1.1.5 Release Notes
+
+发布日期：2020 年 9 月 18 日
+
+TiDB Operator 版本：1.1.5
+
+## 兼容性变化
+
+- 如果 TiFlash 版本低于 `v4.0.5`，请在将 TiDB Operator 升级到 v1.1.5 和更高版本之前，在 TidbCluster CR 中设置 `spec.tiflash.config.config.flash.service_addr` 为 `{clusterName}-tiflash-POD_NUM.{clusterName}-tiflash-peer.{namespace}.svc:3930` (`{clusterName}` 和 `{namespace}` 需要改为集群实际值)。如果这时需要将 TiFlash 升级到 `v4.0.5` 或更高版本，请同时在 TidbCluster CR 中删除 `spec.tiflash.config.config.flash.service_addr` 项 ([#3191](https://github.com/pingcap/tidb-operator/pull/3191), [@DanielZhangQD](https://github.com/DanielZhangQD))
+
+## 新功能
+
+- 支持为 TiDB/Pump/PD 配置 `serviceAccount` ([#3246](https://github.com/pingcap/tidb-operator/pull/3246), [@july2993](https://github.com/july2993))
+- 支持配置 `spec.tikv.config.log-format` 和 `spec.tikv.config.server.max-grpc-send-msg-len` ([#3199](https://github.com/pingcap/tidb-operator/pull/3199), [@kolbe](https://github.com/kolbe))
+- 支持配置 TiDB 的 labels 参数 ([#3188](https://github.com/pingcap/tidb-operator/pull/3188), [@howardlau1999](https://github.com/howardlau1999))
+- 支持从 TiFlash/TiKV 的 failover 中恢复 ([#3189](https://github.com/pingcap/tidb-operator/pull/3189), [@DanielZhangQD](https://github.com/DanielZhangQD))
+- 为 PD/TiKV 添加 `mountClusterClientSecret` 配置，该值为 true 时 Operator 会将 `${cluster_name}-cluster-client-secret` 挂载到 PD/TiKV 容器 ([#3282](https://github.com/pingcap/tidb-operator/pull/3282), [@DanielZhangQD](https://github.com/DanielZhangQD))
+
+## 优化提升
+
+- 支持 TiDB/PD/TiKV 的 v4.0.6 配置 ([#3180](https://github.com/pingcap/tidb-operator/pull/3180), [@lichunzhu](https://github.com/lichunzhu))
+- 挂载集群客户端证书到 PD Pod ([#3248](https://github.com/pingcap/tidb-operator/pull/3248), [@weekface](https://github.com/weekface))
+- 对于 TiFlash/PD/TiDB，使伸缩实例优先于升级，避免升级失败时无法扩缩容 Pod ([#3187](https://github.com/pingcap/tidb-operator/pull/3187), [@lichunzhu](https://github.com/lichunzhu))
+- Pump 支持 `imagePullSecrets` 配置 ([#3214](https://github.com/pingcap/tidb-operator/pull/3214), [@weekface](https://github.com/weekface))
+- 更新 TiFlash 的默认配置项 ([#3191](https://github.com/pingcap/tidb-operator/pull/3191), [@DanielZhangQD](https://github.com/DanielZhangQD))
+- 移除 TidbMonitor CR 的 ClusterRole 资源 ([#3190](https://github.com/pingcap/tidb-operator/pull/3190), [@weekface](https://github.com/weekface))
+- 不再重启 Helm 部署的正常退出的 Drainer ([#3151](https://github.com/pingcap/tidb-operator/pull/3151), [@lichunzhu](https://github.com/lichunzhu))
+- tidb-scheduler 高可用策略将 failover pod 纳入考虑 ([#3171](https://github.com/pingcap/tidb-operator/pull/3171), [@cofyc](https://github.com/cofyc))
+
+## Bug 修复
+
+- 修复 TidbMonitor CR 中的 Grafana container 忽略 `Env` 配置的问题 ([#3237](https://github.com/pingcap/tidb-operator/pull/3237), [@tirsen](https://github.com/tirsen))