[agent-deploy] - update emqx config

agent-deploy/c_middle/CmiiEmqxTemplate.go

@@ -44,10 +44,18 @@ metadata:
     app.kubernetes.io/managed-by: octopus-control
     app.kubernetes.io/version: {{ .TagVersion }}
 data:
-  emqx_auth_username.conf: |-
-    auth.user.1.username = cmlc
-    auth.user.1.password = {{ .EmqxPassword }}
-    auth.user.password_hash = sha256
+  emqx_auth_mnesia.conf: |-
+	auth.mnesia.password_hash = sha256
+
+	# clientid 认证数据
+	# auth.client.1.clientid = admin
+	# auth.client.1.password = 4YPk*DS%+5
+	
+	## username 认证数据
+	auth.user.1.username = admin
+	auth.user.1.password = {{ .EmqxPassword }}
+	auth.user.2.username = cmlc
+    auth.user.2.password = {{ .EmqxPassword }}
 
   acl.conf: |-
     {allow, {user, "admin"}, pubsub, ["admin/#"]}.
@@ -57,7 +65,8 @@ data:
     {allow, all}.
 
   loaded_plugins: |-
-    {emqx_auth_username,true}.
+    {emqx_auth_mnesia,true}.
+    {emqx_auth_mnesia,true}.
     {emqx_management, true}.
     {emqx_recon, true}.
     {emqx_retainer, false}.
@@ -105,7 +114,7 @@ spec:
       containers:
         - name: helm-emqxs
           {{- if .HarborPort }}
-          image: {{ .HarborIPOrCustomImagePrefix }}:{{ .HarborPort }}/cmii/emqx:5.5.1
+          image: {{ .HarborIPOrCustomImagePrefix }}:{{ .HarborPort }}/cmii/emqx:4.4.9
           {{- else }}
           image: {{ .HarborIPOrCustomImagePrefix }}emqx:5.5.1
           {{- end }}
@@ -134,8 +143,8 @@ spec:
               mountPath: "/opt/emqx/data/mnesia"
               readOnly: false
             - name: helm-emqxs-cm
-              mountPath: "/opt/emqx/etc/plugins/emqx_auth_username.conf"
-              subPath: emqx_auth_username.conf
+              mountPath: "/opt/emqx/etc/plugins/emqx_auth_mnesia.conf"
+              subPath: emqx_auth_mnesia.conf
               readOnly: false
 #            - name: helm-emqxs-cm
 #              mountPath: "/opt/emqx/etc/acl.conf"
@@ -153,8 +162,8 @@ spec:
           configMap:
             name: helm-emqxs-cm
             items:
-              - key: emqx_auth_username.conf
-                path: emqx_auth_username.conf
+              - key: emqx_auth_mnesia.conf
+                path: emqx_auth_mnesia.conf
               - key: acl.conf
                 path: acl.conf
               - key: loaded_plugins

agent-deploy/d_app/CmiiImageConfig.go

@@ -111,7 +111,7 @@ var MiddlewareAmd64 = []string{
 	"ossrs/srs:v4.0.136",
 	"ossrs/srs:v5.0.195",
 	"ossrs/srs:v4.0-r3",
-	"emqx/emqx:4.2.12",
+	"emqx/emqx:4.4.9",
 	"emqx/emqx:5.5.1",
 	"nacos/nacos-server:v2.1.2",
 	"nacos/nacos-server:v2.1.2-slim",

server/src/test/java/io/wdd/server/func/TestImageSyncScheduler.java

@@ -38,20 +38,20 @@ public class TestImageSyncScheduler {
     public void runImageSync() {
 
         ArrayList<String> CmiiAppNameList = new ArrayList<>(List.of(
-                "cmii-uav-integration:5.4.0-070301"
+//                "cmii-uav-integration:5.4.0-070301"
         ));
 
         ArrayList<String> ImageFullNameList = new ArrayList<>(List.of(
-//                "harbor.cdcyy.com.cn/cmii/cmii-uav-platform:5.3.0-cqly-060601"
+                "harbor.cdcyy.com.cn/cmii/cmii-uav-platform:5.5.0-26810-071201"
         ));
 
         Boolean downloadAndCompressOnly = false;
 
 //        String projectNamespace = "wdd"; // wdd
-//        String projectNamespace = "cqlyj"; // 重庆林业局
+        String projectNamespace = "cqlyj"; // 重庆林业局
 //        String projectNamespace = "jlyd"; // 吉林移动
 //        String projectNamespace = "jxyd"; // 吉林移动
-        String projectNamespace = "xmyd"; // 厦门移动
+//        String projectNamespace = "xmyd"; // 厦门移动
 
 //        String innerWorkerAgentName = "Chengdu-amd64-65-lapwdd"; //wdd
         String innerWorkerAgentName = "Chengdu-amd64-071-ed6e2b7f"; //prod