From ca67358be5e716d932286f9fd0e49cedcbbb6c0a Mon Sep 17 00:00:00 2001 From: Rory Z <16801068+Rory-Z@users.noreply.github.com> Date: Tue, 9 Apr 2024 18:00:07 +0800 Subject: [PATCH] chore: dump version to 2.2.19 Signed-off-by: Rory Z <16801068+Rory-Z@users.noreply.github.com> --- RELEASE.md | 14 ++++++++++---- docs/en_US/deployment/on-aws-eks.md | 2 +- docs/en_US/getting-started/getting-started.md | 4 ++-- docs/en_US/tasks/configure-emqx-blueGreenUpdate.md | 2 +- docs/en_US/tasks/configure-emqx-config.md | 2 +- docs/en_US/tasks/configure-emqx-core-replicant.md | 2 +- docs/en_US/tasks/configure-emqx-license.md | 4 ++-- docs/en_US/tasks/configure-emqx-persistence.md | 2 +- docs/en_US/tasks/configure-emqx-prometheus.md | 2 +- docs/en_US/tasks/configure-emqx-service.md | 2 +- docs/en_US/tasks/configure-emqx-tls.md | 2 +- docs/zh_CN/deployment/on-aws-eks.md | 2 +- docs/zh_CN/deployment/on-huawei-cloud.md | 2 +- docs/zh_CN/deployment/on-tencent-cloud.md | 2 +- docs/zh_CN/getting-started/getting-started.md | 4 ++-- docs/zh_CN/tasks/configure-emqx-blueGreenUpdate.md | 2 +- docs/zh_CN/tasks/configure-emqx-config.md | 2 +- docs/zh_CN/tasks/configure-emqx-core-replicant.md | 2 +- docs/zh_CN/tasks/configure-emqx-license.md | 4 ++-- docs/zh_CN/tasks/configure-emqx-persistence.md | 2 +- docs/zh_CN/tasks/configure-emqx-prometheus.md | 2 +- docs/zh_CN/tasks/configure-emqx-service.md | 2 +- docs/zh_CN/tasks/configure-emqx-tls.md | 2 +- 23 files changed, 36 insertions(+), 30 deletions(-) diff --git a/RELEASE.md b/RELEASE.md index 69c44137e..fb12be9d0 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -1,6 +1,6 @@ # Release Note 🍻 -EMQX Operator 2.2.18 has been released. +EMQX Operator 2.2.19 has been released. ## Supported version + apps.emqx.io/v2beta1 @@ -13,11 +13,17 @@ EMQX Operator 2.2.18 has been released. + EMQX at 4.4.14 and later + EMQX Enterprise at 4.4.14 and later -## Enhancements ✨ +## Fixes 🛠 + `apps.emqx.io/v2beta1 EMQX`. - + Add podDisruptionBudget for EMQX customer resource. + + Fix the issue that the EMQX operator can not update the K8s service port when the user changes EMQX's listener port by EMQX dashboard. + + + Fix the issue when the EMQX customer resources are updated with changes that affect both the statefulSet and the EMQX config, the statefulSet is updated last and this blocks the update process if the statefulSet changes are referenced in EMQX config. check: https://github.com/emqx/emqx-operator/issues/1027 + +## Other Changes ✨ + ++ Update `sigs.k8s.io/controller-runtime` version to 0.17 ## How to install/upgrade EMQX Operator 💡 @@ -29,7 +35,7 @@ helm repo update helm upgrade --install emqx-operator emqx/emqx-operator \ --namespace emqx-operator-system \ --create-namespace \ - --version 2.2.18 + --version 2.2.19 kubectl wait --for=condition=Ready pods -l "control-plane=controller-manager" -n emqx-operator-system ``` diff --git a/docs/en_US/deployment/on-aws-eks.md b/docs/en_US/deployment/on-aws-eks.md index 40899362c..071dc1af9 100644 --- a/docs/en_US/deployment/on-aws-eks.md +++ b/docs/en_US/deployment/on-aws-eks.md @@ -29,7 +29,7 @@ The following is the relevant configuration of EMQX custom resources. You can se metadata: name: emqx spec: - image: emqx:5.1 + image: emqx:5 coreTemplate: spec: ## EMQX custom resources do not support updating this field at runtime diff --git a/docs/en_US/getting-started/getting-started.md b/docs/en_US/getting-started/getting-started.md index 7881b95f1..23b0e2fd5 100644 --- a/docs/en_US/getting-started/getting-started.md +++ b/docs/en_US/getting-started/getting-started.md @@ -74,7 +74,7 @@ Alternatively, if you are interested in learning how to upgrade or uninstall EMQ metadata: name: emqx-ee spec: - image: emqx/emqx-enterprise:5.1.0 + image: emqx/emqx-enterprise:5.6 ``` For more details about the EMQX CRD, please check the [reference document](../reference/v2beta1-reference.md). @@ -101,7 +101,7 @@ Alternatively, if you are interested in learning how to upgrade or uninstall EMQ metadata: name: emqx spec: - image: emqx:5.1 + image: emqx:5 ``` For more details about the EMQX CRD, please check the [reference document](../reference/v2beta1-reference.md). diff --git a/docs/en_US/tasks/configure-emqx-blueGreenUpdate.md b/docs/en_US/tasks/configure-emqx-blueGreenUpdate.md index 9a3543c36..240426a84 100644 --- a/docs/en_US/tasks/configure-emqx-blueGreenUpdate.md +++ b/docs/en_US/tasks/configure-emqx-blueGreenUpdate.md @@ -113,7 +113,7 @@ kind: EMQX metadata: name: emqx spec: - image: emqx:5.1 + image: emqx:5 updateStrategy: evacuationStrategy: connEvictRate: 1000 diff --git a/docs/en_US/tasks/configure-emqx-config.md b/docs/en_US/tasks/configure-emqx-config.md index bdd90a7df..8b97475a2 100644 --- a/docs/en_US/tasks/configure-emqx-config.md +++ b/docs/en_US/tasks/configure-emqx-config.md @@ -18,7 +18,7 @@ The main configuration file of EMQX is `/etc/emqx.conf`. Starting from version 5 metadata: name: emqx spec: - image: emqx:5.1 + image: emqx:5 imagePullPolicy: IfNotPresent config: data: | diff --git a/docs/en_US/tasks/configure-emqx-core-replicant.md b/docs/en_US/tasks/configure-emqx-core-replicant.md index c68b5a297..4b245583a 100644 --- a/docs/en_US/tasks/configure-emqx-core-replicant.md +++ b/docs/en_US/tasks/configure-emqx-core-replicant.md @@ -29,7 +29,7 @@ There must be at least one Core node in the EMQX cluster. For the purpose of hig metadata: name: emqx spec: - image: emqx:5.1 + image: emqx:5 coreTemplate: spec: replicas: 2 diff --git a/docs/en_US/tasks/configure-emqx-license.md b/docs/en_US/tasks/configure-emqx-license.md index 2a626f4ae..6e8804d35 100644 --- a/docs/en_US/tasks/configure-emqx-license.md +++ b/docs/en_US/tasks/configure-emqx-license.md @@ -33,7 +33,7 @@ The following is the relevant configuration of EMQX Custom Resource. You can cho license { key = "..." } - image: emqx/emqx-enterprise:5.1.0 + image: emqx/emqx-enterprise:5.6 dashboardServiceTemplate: spec: type: LoadBalancer @@ -150,7 +150,7 @@ The following is the relevant configuration of EMQX Custom Resource. You can cho $ kubectl edit emqx emqx-ee ... spec: - image: emqx/emqx-enterprise:5.1.0 + image: emqx/emqx-enterprise:5.6 config: data: | license { diff --git a/docs/en_US/tasks/configure-emqx-persistence.md b/docs/en_US/tasks/configure-emqx-persistence.md index 0f6078f66..8a8d95f26 100644 --- a/docs/en_US/tasks/configure-emqx-persistence.md +++ b/docs/en_US/tasks/configure-emqx-persistence.md @@ -24,7 +24,7 @@ When the user configures the `.spec.coreTemplate.spec.volumeClaimTemplates` fiel metadata: name: emqx spec: - image: emqx:5.1 + image: emqx:5 coreTemplate: spec: volumeClaimTemplates: diff --git a/docs/en_US/tasks/configure-emqx-prometheus.md b/docs/en_US/tasks/configure-emqx-prometheus.md index 33d62c749..cf525400a 100644 --- a/docs/en_US/tasks/configure-emqx-prometheus.md +++ b/docs/en_US/tasks/configure-emqx-prometheus.md @@ -23,7 +23,7 @@ kind: EMQX metadata: name: emqx spec: - image: emqx:5.1 + image: emqx:5 ``` Save the above content as `emqx.yaml` and execute the following command to deploy the EMQX cluster: diff --git a/docs/en_US/tasks/configure-emqx-service.md b/docs/en_US/tasks/configure-emqx-service.md index f44ef3589..60731ec0d 100644 --- a/docs/en_US/tasks/configure-emqx-service.md +++ b/docs/en_US/tasks/configure-emqx-service.md @@ -21,7 +21,7 @@ The following is the relevant configuration of EMQX Custom Resource. You can cho metadata: name: emqx spec: - image: emqx:5.1 + image: emqx:5 listenersServiceTemplate: spec: type: LoadBalancer diff --git a/docs/en_US/tasks/configure-emqx-tls.md b/docs/en_US/tasks/configure-emqx-tls.md index 7699c8e62..549f3e209 100644 --- a/docs/en_US/tasks/configure-emqx-tls.md +++ b/docs/en_US/tasks/configure-emqx-tls.md @@ -52,7 +52,7 @@ There are many types of Volumes. For the description of Volumes, please refer to metadata: name: emqx spec: - image: emqx:5.1 + image: emqx:5 config: data: | listeners.ssl.default { diff --git a/docs/zh_CN/deployment/on-aws-eks.md b/docs/zh_CN/deployment/on-aws-eks.md index 6b27c5cc3..69d117ec7 100644 --- a/docs/zh_CN/deployment/on-aws-eks.md +++ b/docs/zh_CN/deployment/on-aws-eks.md @@ -29,7 +29,7 @@ EMQX Operator 支持在 Amazon 容器服务 EKS（Elastic Kubernetes Service） metadata: name: emqx spec: - image: emqx:5.1 + image: emqx:5 coreTemplate: spec: ## 若开启了持久化，您需要配置 podSecurityContext， diff --git a/docs/zh_CN/deployment/on-huawei-cloud.md b/docs/zh_CN/deployment/on-huawei-cloud.md index add16ab7f..f29512a14 100644 --- a/docs/zh_CN/deployment/on-huawei-cloud.md +++ b/docs/zh_CN/deployment/on-huawei-cloud.md @@ -40,7 +40,7 @@ EMQX Operator 支持在华为云容器引擎（Cloud Container Engine，简称 C metadata: name: emqx spec: - image: emqx:5.1 + image: emqx:5 coreTemplate: spec: ## EMQX 自定义资源不支持在运行时更新这个字段 diff --git a/docs/zh_CN/deployment/on-tencent-cloud.md b/docs/zh_CN/deployment/on-tencent-cloud.md index a2a2b0f6e..cbad5ada6 100644 --- a/docs/zh_CN/deployment/on-tencent-cloud.md +++ b/docs/zh_CN/deployment/on-tencent-cloud.md @@ -30,7 +30,7 @@ EMQX Operator 支持在腾讯云容器服务（Tencent Kubernetes Engine，TKE metadata: name: emqx spec: - image: emqx:5.1 + image: emqx:5 coreTemplate: spec: ## EMQX 自定义资源不支持在运行时更新这个字段 diff --git a/docs/zh_CN/getting-started/getting-started.md b/docs/zh_CN/getting-started/getting-started.md index 862a34715..3bfce74cc 100644 --- a/docs/zh_CN/getting-started/getting-started.md +++ b/docs/zh_CN/getting-started/getting-started.md @@ -71,7 +71,7 @@ metadata: name: emqx-ee spec: - image: emqx/emqx-enterprise:5.1.0 + image: emqx/emqx-enterprise:5.6 ``` 并使用 `kubectl apply` 命令来部署 EMQX。 @@ -102,7 +102,7 @@ metadata: name: emqx spec: - image: emqx:5.1 + image: emqx:5 ``` 并使用 `kubectl apply` 命令来部署 EMQX。 diff --git a/docs/zh_CN/tasks/configure-emqx-blueGreenUpdate.md b/docs/zh_CN/tasks/configure-emqx-blueGreenUpdate.md index aace12da5..b7cee5721 100644 --- a/docs/zh_CN/tasks/configure-emqx-blueGreenUpdate.md +++ b/docs/zh_CN/tasks/configure-emqx-blueGreenUpdate.md @@ -108,7 +108,7 @@ kind: EMQX metadata: name: emqx spec: - image: emqx:5.1 + image: emqx:5 updateStrategy: evacuationStrategy: connEvictRate: 1000 diff --git a/docs/zh_CN/tasks/configure-emqx-config.md b/docs/zh_CN/tasks/configure-emqx-config.md index d36243743..5e3f05108 100644 --- a/docs/zh_CN/tasks/configure-emqx-config.md +++ b/docs/zh_CN/tasks/configure-emqx-config.md @@ -22,7 +22,7 @@ EMQX 主配置文件为 `etc/emqx.conf`，从 5.0 版本开始，EMQX 采用 [HO metadata: name: emqx spec: - image: emqx:5.1 + image: emqx:5 config: data: | listeners.tcp.test { diff --git a/docs/zh_CN/tasks/configure-emqx-core-replicant.md b/docs/zh_CN/tasks/configure-emqx-core-replicant.md index be492bbea..2b4455c2f 100644 --- a/docs/zh_CN/tasks/configure-emqx-core-replicant.md +++ b/docs/zh_CN/tasks/configure-emqx-core-replicant.md @@ -29,7 +29,7 @@ EMQX 集群中至少要有一个 Core 节点，出于高可用的目的，EMQX O metadata: name: emqx spec: - image: emqx:5.1 + image: emqx:5 coreTemplate: spec: replicas: 2 diff --git a/docs/zh_CN/tasks/configure-emqx-license.md b/docs/zh_CN/tasks/configure-emqx-license.md index 8b5a4acc7..363e4c5f4 100644 --- a/docs/zh_CN/tasks/configure-emqx-license.md +++ b/docs/zh_CN/tasks/configure-emqx-license.md @@ -33,7 +33,7 @@ EMQX 企业版 License 可以在 EMQ 官网免费申请：[申请 EMQX 企业版 license { key = "${your_license_key}" } - image: emqx/emqx-enterprise:5.1.0 + image: emqx/emqx-enterprise:5.6 listenersServiceTemplate: spec: type: LoadBalancer @@ -153,7 +153,7 @@ EMQX 企业版 License 可以在 EMQ 官网免费申请：[申请 EMQX 企业版 $ kubectl edit emqx emqx-ee ... spec: - image: emqx/emqx-enterprise:5.1.0 + image: emqx/emqx-enterprise:5.6 config: data: | license { diff --git a/docs/zh_CN/tasks/configure-emqx-persistence.md b/docs/zh_CN/tasks/configure-emqx-persistence.md index 04b54b291..58803c29d 100644 --- a/docs/zh_CN/tasks/configure-emqx-persistence.md +++ b/docs/zh_CN/tasks/configure-emqx-persistence.md @@ -24,7 +24,7 @@ metadata: name: emqx spec: - image: emqx:5.1 + image: emqx:5 coreTemplate: spec: volumeClaimTemplates: diff --git a/docs/zh_CN/tasks/configure-emqx-prometheus.md b/docs/zh_CN/tasks/configure-emqx-prometheus.md index 7061ed042..c6b79ed34 100644 --- a/docs/zh_CN/tasks/configure-emqx-prometheus.md +++ b/docs/zh_CN/tasks/configure-emqx-prometheus.md @@ -23,7 +23,7 @@ kind: EMQX metadata: name: emqx spec: - image: emqx:5.1 + image: emqx:5 coreTemplate: spec: ports: diff --git a/docs/zh_CN/tasks/configure-emqx-service.md b/docs/zh_CN/tasks/configure-emqx-service.md index fa2154cf4..bbfd7a273 100644 --- a/docs/zh_CN/tasks/configure-emqx-service.md +++ b/docs/zh_CN/tasks/configure-emqx-service.md @@ -21,7 +21,7 @@ metadata: name: emqx spec: - image: emqx:5.1 + image: emqx:5 listenersServiceTemplate: spec: type: LoadBalancer diff --git a/docs/zh_CN/tasks/configure-emqx-tls.md b/docs/zh_CN/tasks/configure-emqx-tls.md index 490c2a8d2..3969f192d 100644 --- a/docs/zh_CN/tasks/configure-emqx-tls.md +++ b/docs/zh_CN/tasks/configure-emqx-tls.md @@ -52,7 +52,7 @@ Volumes 的类型有很多种，关于 Volumes 描述可以参考文档：[Volum metadata: name: emqx spec: - image: emqx:5.1 + image: emqx:5 config: data: | listeners.ssl.default {