Merge pull request #120 from Poorunga/tunnel-port

modify tunnelServer and tunnelAgent listen port
kubeedge · Oct 12, 2021 · e705c8e · e705c8e
2 parents 460d86c + 5ecd0f5
commit e705c8e
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"`