diff --git a/agent-deploy/c_middle/CmiiEmqxTemplate.go b/agent-deploy/c_middle/CmiiEmqxTemplate.go index d9d053d..2d372a2 100755 --- a/agent-deploy/c_middle/CmiiEmqxTemplate.go +++ b/agent-deploy/c_middle/CmiiEmqxTemplate.go @@ -116,7 +116,7 @@ spec: {{- if .HarborPort }} image: {{ .HarborIPOrCustomImagePrefix }}:{{ .HarborPort }}/cmii/emqx:4.4.9 {{- else }} - image: {{ .HarborIPOrCustomImagePrefix }}emqx:5.5.1 + image: {{ .HarborIPOrCustomImagePrefix }}emqx:4.4.9 {{- end }} imagePullPolicy: Always ports: diff --git a/agent-deploy/c_middle/CmiiMongoTemplate.go b/agent-deploy/c_middle/CmiiMongoTemplate.go index fa7bece..5790fc5 100755 --- a/agent-deploy/c_middle/CmiiMongoTemplate.go +++ b/agent-deploy/c_middle/CmiiMongoTemplate.go @@ -13,7 +13,7 @@ metadata: app.kubernetes.io/managed-by: octopus-control app.kubernetes.io/version: {{ .TagVersion }} spec: - type: ClusterIP + type: NodePort selector: cmii.app: helm-mongo cmii.type: middleware @@ -21,6 +21,7 @@ spec: - port: 27017 name: server-27017 targetPort: 27017 + nodePort: {{ .MongoNodePort }} --- apiVersion: apps/v1 kind: StatefulSet diff --git a/agent-deploy/c_middle/DeployMiddleware.go b/agent-deploy/c_middle/DeployMiddleware.go index 1a35018..cc586fd 100755 --- a/agent-deploy/c_middle/DeployMiddleware.go +++ b/agent-deploy/c_middle/DeployMiddleware.go @@ -65,6 +65,7 @@ type NacosConfig struct { type MongoConfig struct { z_dep.CommonEnvironmentConfig MongoPassword string + MongoNodePort string } type EmqxConfig struct { diff --git a/agent-deploy/e_cmii/CmiiEnvConfiguration.go b/agent-deploy/e_cmii/CmiiEnvConfiguration.go index 537ab41..2a5426f 100644 --- a/agent-deploy/e_cmii/CmiiEnvConfiguration.go +++ b/agent-deploy/e_cmii/CmiiEnvConfiguration.go @@ -29,6 +29,7 @@ var CmiiOutSideConfig = &CmiiEnvConfig{ RedisConfig: c_middle.RedisConfig{}, MongoConfig: c_middle.MongoConfig{ MongoPassword: "REdPza8#oVlt", + MongoNodePort: "37017", }, RabbitMQConfig: c_middle.RabbitMQConfig{ CommonEnvironmentConfig: z_dep.CommonEnvironmentConfig{}, @@ -68,6 +69,7 @@ var CmiiDevConfig = &CmiiEnvConfig{ RedisConfig: c_middle.RedisConfig{}, MongoConfig: c_middle.MongoConfig{ MongoPassword: "7(#dD3zcz8", + MongoNodePort: "37017", }, RabbitMQConfig: c_middle.RabbitMQConfig{ CommonEnvironmentConfig: z_dep.CommonEnvironmentConfig{}, @@ -107,6 +109,7 @@ var CmiiDevFlightConfig = &CmiiEnvConfig{ RedisConfig: c_middle.RedisConfig{}, MongoConfig: c_middle.MongoConfig{ MongoPassword: "7(#dD3zcz8", + MongoNodePort: "37018", }, RabbitMQConfig: c_middle.RabbitMQConfig{ CommonEnvironmentConfig: z_dep.CommonEnvironmentConfig{}, @@ -146,6 +149,7 @@ var CmiiDevOperationConfig = &CmiiEnvConfig{ RedisConfig: c_middle.RedisConfig{}, MongoConfig: c_middle.MongoConfig{ MongoPassword: "7(#dD3zcz8", + MongoNodePort: "37019", }, RabbitMQConfig: c_middle.RabbitMQConfig{ CommonEnvironmentConfig: z_dep.CommonEnvironmentConfig{},