diff --git a/agent/pkg/tunnel/config/config.go b/agent/pkg/tunnel/config/config.go index 1b21ffc16..704cf25cc 100644 --- a/agent/pkg/tunnel/config/config.go +++ b/agent/pkg/tunnel/config/config.go @@ -19,7 +19,7 @@ type TunnelAgentConfig struct { // NodeName indicates the node name of tunnel agent NodeName string `json:"nodeName"` // ListenPort indicates the listen port of tunnel agent - // default 10006 + // default 20006 ListenPort int `json:"listenPort"` } @@ -35,6 +35,6 @@ func NewTunnelAgentConfig() *TunnelAgentConfig { TLSPrivateKeyFile: meshConstants.AgentDefaultKeyFile, }, NodeName: nodeName, - ListenPort: 10006, + ListenPort: 20006, } } diff --git a/build/agent/kubernetes/edgemesh-agent/06-configmap-cloud.yaml b/build/agent/kubernetes/edgemesh-agent/06-configmap-cloud.yaml index 09f953385..028239e5d 100644 --- a/build/agent/kubernetes/edgemesh-agent/06-configmap-cloud.yaml +++ b/build/agent/kubernetes/edgemesh-agent/06-configmap-cloud.yaml @@ -48,3 +48,4 @@ data: excludeIP: "*" tunnel: enable: true + listenPort: 20006 diff --git a/build/agent/kubernetes/edgemesh-agent/06-configmap-edge.yaml b/build/agent/kubernetes/edgemesh-agent/06-configmap-edge.yaml index 32912a41c..5ef0fc7c1 100644 --- a/build/agent/kubernetes/edgemesh-agent/06-configmap-edge.yaml +++ b/build/agent/kubernetes/edgemesh-agent/06-configmap-edge.yaml @@ -48,4 +48,4 @@ data: excludeIP: "*" tunnel: enable: true - listenPort: 10006 + listenPort: 20006 diff --git a/build/server/edgemesh/06-deployment.yaml b/build/server/edgemesh/06-deployment.yaml index 181fd4962..d1945890b 100644 --- a/build/server/edgemesh/06-deployment.yaml +++ b/build/server/edgemesh/06-deployment.yaml @@ -29,7 +29,7 @@ spec: fieldRef: fieldPath: spec.nodeName ports: - - containerPort: 10004 + - containerPort: 20004 name: relay protocol: TCP resources: diff --git a/server/cmd/edgemesh-server/app/config/config.go b/server/cmd/edgemesh-server/app/config/config.go index 7f1d6dee9..b43bc5f8d 100644 --- a/server/cmd/edgemesh-server/app/config/config.go +++ b/server/cmd/edgemesh-server/app/config/config.go @@ -67,7 +67,7 @@ func NewEdgeMeshServerConfig() *EdgeMeshServerConfig { TLSPrivateKeyFile: meshConstants.ServerDefaultKeyFile, }, NodeName: nodeName, - ListenPort: 10004, + ListenPort: 20004, PublicIP: "0.0.0.0", }}, } diff --git a/server/pkg/tunnel/config/config.go b/server/pkg/tunnel/config/config.go index ac7a75653..4d196b220 100644 --- a/server/pkg/tunnel/config/config.go +++ b/server/pkg/tunnel/config/config.go @@ -13,7 +13,7 @@ type TunnelServerConfig struct { // NodeName indicates the node name of tunnel server NodeName string `json:"nodeName"` // ListenPort indicates the listen port of tunnel server - // default 10004 + // default 20004 ListenPort int `json:"listenPort"` // PublicIP indicates the public ip of tunnel server PublicIP string `json:"publicIP"`