chore: dump emqx version to 5.1

kiragoo · Jun 28, 2023 · c3cbb6d · c3cbb6d
1 parent bf19f40
commit c3cbb6d
Show file tree

Hide file tree

Showing 35 changed files with 73 additions and 73 deletions.
diff --git a/apis/apps/v2alpha2/emqx_webhook.go b/apis/apps/v2alpha2/emqx_webhook.go
@@ -224,10 +224,10 @@ func (r *EMQX) defaultBootstrapConfig() {
 	  default_username = admin
 	  default_password = public
 	}
-	listeners.tcp.default {
-		bind = "0.0.0.0:1883"
-		max_connections = 1024000
-	}
+	listeners.tcp.default.bind = "0.0.0.0:1883"
+	listeners.ssl.default.bind = "0.0.0.0:8883"
+	listeners.ws.default.bind = "0.0.0.0:8083"
+	listeners.wss.default.bind = "0.0.0.0:8084"
 	`, dnsName)
 
 	bootstrapConfig := fmt.Sprintf("%s\n%s", defaultBootstrapConfigStr, r.Spec.BootstrapConfig)

diff --git a/apis/apps/v2alpha2/emqx_webhook_test.go b/apis/apps/v2alpha2/emqx_webhook_test.go
@@ -198,7 +198,9 @@ func TestDefaultBootstrapConfig(t *testing.T) {
 		assert.Equal(t, "public", bootstrapConfig.GetString("dashboard.default_password"))
 
 		assert.Equal(t, "\"0.0.0.0:1883\"", bootstrapConfig.GetString("listeners.tcp.default.bind"))
-		assert.Equal(t, "1024000", bootstrapConfig.GetString("listeners.tcp.default.max_connections"))
+		assert.Equal(t, "\"0.0.0.0:8883\"", bootstrapConfig.GetString("listeners.ssl.default.bind"))
+		assert.Equal(t, "\"0.0.0.0:8083\"", bootstrapConfig.GetString("listeners.ws.default.bind"))
+		assert.Equal(t, "\"0.0.0.0:8084\"", bootstrapConfig.GetString("listeners.wss.default.bind"))
 	})
 
 	t.Run("already set cookie", func(t *testing.T) {
@@ -225,7 +227,6 @@ func TestDefaultBootstrapConfig(t *testing.T) {
 		bootstrapConfig, err := hocon.ParseString(instance.Spec.BootstrapConfig)
 		assert.Nil(t, err)
 		assert.Equal(t, "\"0.0.0.0:11883\"", bootstrapConfig.GetString("listeners.tcp.default.bind"))
-		assert.Equal(t, "1024000", bootstrapConfig.GetString("listeners.tcp.default.max_connections"))
 	})
 
 	t.Run("other style set listener", func(t *testing.T) {
@@ -247,7 +248,6 @@ func TestDefaultBootstrapConfig(t *testing.T) {
 		bootstrapConfig, err := hocon.ParseString(instance.Spec.BootstrapConfig)
 		assert.Nil(t, err)
 		assert.Equal(t, "\"0.0.0.0:11883\"", bootstrapConfig.GetString("listeners.tcp.default.bind"))
-		assert.Equal(t, "1024000", bootstrapConfig.GetString("listeners.tcp.default.max_connections"))
 	})
 
 	t.Run("wrong bootstrap config", func(t *testing.T) {

diff --git a/config/samples/emqx/v2alpha1/emqx-full.yaml b/config/samples/emqx/v2alpha1/emqx-full.yaml
@@ -3,7 +3,7 @@ kind: EMQX
 metadata:
   name: emqx
 spec:
-  image: "emqx:5.0"
+  image: "emqx:5.1"
   imagePullPolicy: IfNotPresent
   # imagePullSecrets:
   #   - name: fake-secrets

diff --git a/config/samples/emqx/v2alpha1/emqx-slim.yaml b/config/samples/emqx/v2alpha1/emqx-slim.yaml
@@ -3,4 +3,4 @@ kind: EMQX
 metadata:
   name: emqx
 spec:
-  image: emqx:5.0
+  image: emqx:5.1
diff --git a/config/samples/emqx/v2alpha2/emqx-slim.yaml b/config/samples/emqx/v2alpha2/emqx-slim.yaml
@@ -3,4 +3,4 @@ kind: EMQX
 metadata:
   name: emqx
 spec:
-  image: emqx:5.0
+  image: emqx:5.1
diff --git a/controllers/apps/v2alpha2/add_emqx_core_test.go b/controllers/apps/v2alpha2/add_emqx_core_test.go
@@ -26,7 +26,7 @@ func TestGenerateStatefulSet(t *testing.T) {
 			Namespace: "emqx",
 		},
 		Spec: appsv2alpha2.EMQXSpec{
-			Image: "emqx/emqx:5.0",
+			Image: "emqx/emqx:5.1",
 		},
 	}
 	instance.Spec.CoreTemplate.Spec.Replicas = pointer.Int32(3)
@@ -102,7 +102,7 @@ func TestGenerateStatefulSet(t *testing.T) {
 		got := generateStatefulSet(emqx)
 		assert.Len(t, got.Spec.Template.Spec.Containers, 2)
 
-		emqx.Spec.Image = "emqx/emqx:5.0"
+		emqx.Spec.Image = "emqx/emqx:5.1"
 		emqx.Spec.ImagePullPolicy = corev1.PullIfNotPresent
 		emqx.Spec.CoreTemplate.Spec.Command = []string{"fake"}
 		emqx.Spec.CoreTemplate.Spec.Args = []string{"fake"}

diff --git a/controllers/apps/v2alpha2/status_machine_test.go b/controllers/apps/v2alpha2/status_machine_test.go
@@ -67,7 +67,7 @@ func TestNextStatusForCoreUpdate(t *testing.T) {
 
 		emqx := &appsv2alpha2.EMQX{
 			Spec: appsv2alpha2.EMQXSpec{
-				Image: "emqx/emqx:5.0",
+				Image: "emqx/emqx:5.1",
 			},
 			Status: appsv2alpha2.EMQXStatus{
 				CurrentImage: "emqx/emqx:latest",
@@ -165,7 +165,7 @@ func TestNextStatusForCodeNodesReady(t *testing.T) {
 
 		emqx := &appsv2alpha2.EMQX{
 			Spec: appsv2alpha2.EMQXSpec{
-				Image: "emqx/emqx:5.0",
+				Image: "emqx/emqx:5.1",
 			},
 			Status: appsv2alpha2.EMQXStatus{
 				CurrentImage: "emqx/emqx:latest",
@@ -283,7 +283,7 @@ func TestNextStatusForCoreReady(t *testing.T) {
 
 		emqx := &appsv2alpha2.EMQX{
 			Spec: appsv2alpha2.EMQXSpec{
-				Image: "emqx/emqx:5.0",
+				Image: "emqx/emqx:5.1",
 			},
 			Status: appsv2alpha2.EMQXStatus{
 				CurrentImage: "emqx/emqx:latest",

diff --git a/docs/en_US/deployment/on-aws-eks.md b/docs/en_US/deployment/on-aws-eks.md
@@ -101,7 +101,7 @@ The following is the relevant configuration of EMQX custom resources. You can se
   metadata:
     name: emqx
   spec:
-    image: emqx:5.0
+    image: emqx:5.1
     coreTemplate:
       spec:
         ## If persistence is enabled, you need to configure podSecurityContext.
@@ -155,7 +155,7 @@ The following is the relevant configuration of EMQX custom resources. You can se
   ```bash
   $ kubectl get emqx
   NAME   IMAGE      STATUS    AGE
-  emqx   emqx:5.0   Running   18m
+  emqx   emqx:5.1   Running   18m
   ```
 
 + Obtain Dashboard External IP of EMQX cluster and access EMQX console

diff --git a/docs/en_US/deployment/on-azure-aks.md b/docs/en_US/deployment/on-azure-aks.md
@@ -82,7 +82,7 @@ kind: EMQX
 metadata:
   name: emqx
 spec:
-  image: "emqx:5.0"
+  image: "emqx:5.1"
   coreTemplate:
     spec:
       volumeClaimTemplates:
@@ -108,7 +108,7 @@ Wait for the EMQX cluster to be ready. You can check the status of the EMQX clus
 ```shell
 $ kubectl get emqx
 NAME   IMAGE      STATUS    AGE
-emqx   emqx:5.0   Running   118s
+emqx   emqx:5.1   Running   118s
 ```
 
 Get the External IP of the EMQX cluster and access the EMQX console.

diff --git a/docs/en_US/deployment/on-gcp-gke.md b/docs/en_US/deployment/on-gcp-gke.md
@@ -99,7 +99,7 @@ kind: EMQX
 metadata:
   name: emqx
 spec:
-  image: "emqx:5.0"
+  image: "emqx:5.1"
   coreTemplate:
     spec:
       volumeClaimTemplates:
@@ -125,7 +125,7 @@ Wait for the EMQX cluster to be ready. You can check the status of the EMQX clus
 ```shell
 $ kubectl get emqx
 NAME   IMAGE      STATUS    AGE
-emqx   emqx:5.0   Running   118s
+emqx   emqx:5.1   Running   118s
 ```
 
 Get the External IP of the EMQX cluster and access the EMQX console.

diff --git a/docs/en_US/getting-started/getting-started.md b/docs/en_US/getting-started/getting-started.md
@@ -131,7 +131,7 @@ Alternatively, if you are interested in learning how to upgrade or uninstall EMQ
    metadata:
       name: emqx-ee
    spec:
-      image: emqx/emqx-enterprise:5.0.1
+      image: emqx/emqx-enterprise:5.1.0
    ```
 
    For more details about the EMQX CRD, please check the [reference document](../reference/v2alpha1-reference.md).
@@ -142,7 +142,7 @@ Alternatively, if you are interested in learning how to upgrade or uninstall EMQ
    $ kubectl get emqx
 
    NAME      IMAGE                        STATUS    AGE
-   emqx-ee   emqx/emqx-enterprise:5.0.1   Running   2m55s
+   emqx-ee   emqx/emqx-enterprise:5.1.0   Running   2m55s
    ```
 
    Make sure the `STATUS` is `Running`, it maybe takes some time to wait for the EMQX cluster to be ready.
@@ -158,7 +158,7 @@ Alternatively, if you are interested in learning how to upgrade or uninstall EMQ
    metadata:
       name: emqx
    spec:
-      image: emqx:5.0
+      image: emqx:5.1
    ```
 
    For more details about the EMQX CRD, please check the [reference document](../reference/v2alpha1-reference.md).
@@ -169,7 +169,7 @@ Alternatively, if you are interested in learning how to upgrade or uninstall EMQ
    $ kubectl get emqx
 
    NAME   IMAGE      STATUS    AGE
-   emqx   emqx:5.0   Running   2m55s
+   emqx   emqx:5.1   Running   2m55s
    ```
 
    Make sure the `STATUS` is `Running`, it maybe takes some time to wait for the EMQX cluster to be ready.

diff --git a/docs/en_US/tasks/configure-emqx-bootstrapConfig.md b/docs/en_US/tasks/configure-emqx-bootstrapConfig.md
@@ -22,7 +22,7 @@ This is only applicable before EMQX is started. If you need to modify the cluste
    metadata:
       name: emqx
    spec:
-      image: emqx:5.0
+      image: emqx:5.1
       imagePullPolicy: IfNotPresent
       bootstrapConfig: |
          listeners.tcp.test {
@@ -44,7 +44,7 @@ This is only applicable before EMQX is started. If you need to modify the cluste
    ```bash
    $ kubectl get emqx emqx
    NAME   IMAGE      STATUS    AGE
-   emqx   emqx:5.0   Running   10m
+   emqx   emqx:5.1   Running   10m
    ```
 
 + Obtain the Dashboard External IP of EMQX cluster and access EMQX console

diff --git 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.0
+    image: emqx:5.1
     coreTemplate:
       spec:
         replicas: 3
@@ -56,7 +56,7 @@ There must be at least one Core node in the EMQX cluster. For the purpose of hig
   ```bash
   $ kubectl get emqx emqx
   NAME   IMAGE      STATUS    AGE
-  emqx   emqx:5.0   Running   10m
+  emqx   emqx:5.1   Running   10m
   ```
 
 + Obtain the Dashboard External IP of EMQX cluster and access EMQX console

diff --git a/docs/en_US/tasks/configure-emqx-license.md b/docs/en_US/tasks/configure-emqx-license.md
@@ -89,7 +89,7 @@ The following is the relevant configuration of EMQX Custom Resource. You can cho
       license {
         key = "..."
       }
-    image: emqx/emqx-enterprise:5.0.0
+    image: emqx/emqx-enterprise:5.1.0
     dashboardServiceTemplate:
       spec:
         type: LoadBalancer
@@ -102,7 +102,7 @@ The following is the relevant configuration of EMQX Custom Resource. You can cho
   ```bash
   $ kubectl get emqx emqx
   NAME   IMAGE      STATUS    AGE
-  emqx   emqx:5.0   Running   10m
+  emqx   emqx:5.1   Running   10m
   ```
 
 + Obtain the Dashboard External IP of EMQX cluster and access EMQX console

diff --git a/docs/en_US/tasks/configure-emqx-log-level.md b/docs/en_US/tasks/configure-emqx-log-level.md
@@ -90,7 +90,7 @@ The following is the relevant configuration of EMQX Custom Resource. You can cho
   ```bash
   $ kubectl get emqx
   NAME   IMAGE      STATUS    AGE
-  emqx   emqx:5.0   Running   10m
+  emqx   emqx:5.1   Running   10m
   ```
 
 + EMQX Operator will create two EMQX Service resources, one is emqx-dashboard and the other is emqx-listeners, corresponding to EMQX console and EMQX listening port respectively.

diff --git a/docs/en_US/tasks/configure-emqx-persistence.md b/docs/en_US/tasks/configure-emqx-persistence.md
@@ -79,7 +79,7 @@ When the user configures the `.spec.coreTemplate.spec.volumeClaimTemplates` fiel
   metadata:
     name: emqx
   spec:
-    image: emqx:5.0
+    image: emqx:5.1
     coreTemplate:
       spec:
         volumeClaimTemplates:
@@ -105,7 +105,7 @@ When the user configures the `.spec.coreTemplate.spec.volumeClaimTemplates` fiel
   ```bash
   $ kubectl get emqx emqx
   NAME   IMAGE      STATUS    AGE
-  emqx   emqx:5.0   Running   10m
+  emqx   emqx:5.1   Running   10m
   ```
 
 + Obtain the Dashboard External IP of the EMQX cluster and access the EMQX console

diff --git 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.0
+  image: emqx:5.1
   coreTemplate:
     spec:
       ports:
@@ -51,7 +51,7 @@ Check the status of the EMQX cluster and make sure that `STATUS` is `Running`, w
 $ kubectl get emqx emqx
 
 NAME   IMAGE      STATUS    AGE
-emqx   emqx:5.0   Running   10m
+emqx   emqx:5.1   Running   10m
 ```
 
 :::

diff --git a/docs/en_US/tasks/configure-emqx-service.md b/docs/en_US/tasks/configure-emqx-service.md
@@ -64,7 +64,7 @@ The following is the relevant configuration of EMQX Custom Resource. You can cho
   metadata:
     name: emqx
   spec:
-    image: emqx:5.0
+    image: emqx:5.1
     listenersServiceTemplate:
       spec:
         type: LoadBalancer
@@ -82,7 +82,7 @@ The following is the relevant configuration of EMQX Custom Resource. You can cho
   ```bash
   $ kubectl get emqx emqx
   NAME   IMAGE      STATUS    AGE
-  emqx   emqx:5.0   Running   10m
+  emqx   emqx:5.1   Running   10m
   ```
 + Obtain the Dashboard External IP of EMQX cluster and access EMQX console
 

diff --git a/docs/en_US/tasks/configure-emqx-tls.md b/docs/en_US/tasks/configure-emqx-tls.md
@@ -114,7 +114,7 @@ There are many types of Volumes. For the description of Volumes, please refer to
   metadata:
     name: emqx
   spec:
-    image: emqx:5.0
+    image: emqx:5.1
     bootstrapConfig: |
       listeners.ssl.default {
         bind = "0.0.0.0:8883"
@@ -162,7 +162,7 @@ There are many types of Volumes. For the description of Volumes, please refer to
   $ kubectl get emqx
 
   NAME   IMAGE      STATUS    AGE
-  emqx   emqx:5.0   Running   10m
+  emqx   emqx:5.1   Running   10m
   ```
 
 + Obtain the External IP of EMQX cluster and access EMQX console

diff --git a/docs/zh_CN/deployment/on-alibaba-cloud.md b/docs/zh_CN/deployment/on-alibaba-cloud.md
@@ -89,7 +89,7 @@ EMQX Operator 支持在阿里云容器服务 Kubernetes 版部署 EMQX。阿里
   metadata:
     name: emqx
   spec:
-    image: "emqx:5.0"
+    image: "emqx:5.1"
     coreTemplate:
       spec:
         ## EMQX 自定义资源不支持在运行时更新这个字段
@@ -126,7 +126,7 @@ EMQX Operator 支持在阿里云容器服务 Kubernetes 版部署 EMQX。阿里
   ```bash
   $ kubectl get emqx
   NAME   IMAGE      STATUS    AGE
-  emqx   emqx:5.0   Running   2m55s
+  emqx   emqx:5.1   Running   2m55s
   ```
 
 + 获取 EMQX 集群 Dashboard External IP, 访问 EMQX 控制台
@@ -261,7 +261,7 @@ kind: EMQX
 metadata:
   name: emqx
 spec:
-  image: "emqx:5.0"
+  image: "emqx:5.1"
   coreTemplate:
     spec:
       ## EMQX 自定义资源不支持在运行时更新这个字段

diff --git a/docs/zh_CN/deployment/on-aws-eks.md b/docs/zh_CN/deployment/on-aws-eks.md
@@ -100,7 +100,7 @@ EMQX Operator 支持在 Amazon 容器服务 EKS（Elastic Kubernetes Service）
   metadata:
     name: emqx
   spec:
-    image: emqx:5.0
+    image: emqx:5.1
     coreTemplate:
       spec:
         ## 若开启了持久化，您需要配置 podSecurityContext，
@@ -154,7 +154,7 @@ EMQX Operator 支持在 Amazon 容器服务 EKS（Elastic Kubernetes Service）
   ```bash
   $ kubectl get emqx
   NAME   IMAGE      STATUS    AGE
-  emqx   emqx:5.0   Running   18m
+  emqx   emqx:5.1   Running   18m
   ```
 
 + 获取 EMQX 集群的 Dashboard External IP, 访问 EMQX 控制台

diff --git a/docs/zh_CN/deployment/on-azure-aks.md b/docs/zh_CN/deployment/on-azure-aks.md
@@ -81,7 +81,7 @@ kind: EMQX
 metadata:
   name: emqx
 spec:
-  image: "emqx:5.0"
+  image: "emqx:5.1"
   coreTemplate:
     spec:
       volumeClaimTemplates:
@@ -107,7 +107,7 @@ spec:
 ```shell
 $ kubectl get emqx
 NAME   IMAGE      STATUS    AGE
-emqx   emqx:5.0   Running   118s
+emqx   emqx:5.1   Running   118s
 ```
 
 获取 EMQX 集群的外部 IP，并访问 EMQX 控制台。