diff options
| author | kadisi <iamkadisi@163.com> | 2020-04-17 20:30:43 +0800 |
|---|---|---|
| committer | kadisi <iamkadisi@163.com> | 2020-04-30 18:41:47 +0800 |
| commit | 0eb46059996e8afdca41d44597c894250ab153a5 (patch) | |
| tree | 8ed5e5448173bc3af564cd66cb8285c63764c274 /edge | |
| parent | add edgestream (diff) | |
| download | kubeedge-0eb46059996e8afdca41d44597c894250ab153a5.tar.gz | |
change serverport
Signed-off-by: kadisi <iamkadisi@163.com>
Diffstat (limited to 'edge')
| -rw-r--r-- | edge/pkg/edged/config/config.go | 4 | ||||
| -rw-r--r-- | edge/pkg/edged/edged_status.go | 2 | ||||
| -rw-r--r-- | edge/pkg/edged/server/server.go | 9 |
3 files changed, 8 insertions, 7 deletions
diff --git a/edge/pkg/edged/config/config.go b/edge/pkg/edged/config/config.go index 102bc88f7..9fa6781d0 100644 --- a/edge/pkg/edged/config/config.go +++ b/edge/pkg/edged/config/config.go @@ -25,9 +25,9 @@ const ( // ImagePullProgressDeadlineDefault gives the default image pull progress deadline ImagePullProgressDeadlineDefault = 60 - // KubeletPort is the default port for the kubelet server on each host machine. + // ServerPort is the default port for the edgecore server on each host machine. // May be overridden by a flag at startup in the future. - KubeletPort = 10350 + ServerPort = 10350 ) var Config Configure diff --git a/edge/pkg/edged/edged_status.go b/edge/pkg/edged/edged_status.go index 6ccdd111e..df859574b 100644 --- a/edge/pkg/edged/edged_status.go +++ b/edge/pkg/edged/edged_status.go @@ -190,7 +190,7 @@ func (e *edged) getNodeStatusRequest(node *v1.Node) (*edgeapi.NodeStatusRequest, func (e *edged) setNodeStatusDaemonEndpoints(node *edgeapi.NodeStatusRequest) { node.Status.DaemonEndpoints = v1.NodeDaemonEndpoints{ KubeletEndpoint: v1.DaemonEndpoint{ - Port: config.KubeletPort, + Port: config.ServerPort, }, } } diff --git a/edge/pkg/edged/server/server.go b/edge/pkg/edged/server/server.go index f78d7eb41..f1951f36a 100644 --- a/edge/pkg/edged/server/server.go +++ b/edge/pkg/edged/server/server.go @@ -4,6 +4,8 @@ import ( "net" "net/http" + "github.com/kubeedge/kubeedge/edge/pkg/edged/config" + "k8s.io/klog" "k8s.io/kubernetes/pkg/kubelet/server" "k8s.io/kubernetes/pkg/kubelet/server/stats" @@ -14,7 +16,6 @@ import ( //constants to define server address const ( ServerAddr = "127.0.0.1" - ServerPort = "10350" ) //TunnelServer is object to define server @@ -31,11 +32,11 @@ func NewServer(podManager podmanager.Manager) *Server { // ListenAndServe starts a HTTP server and sets up a listener on the given host/port func (s *Server) ListenAndServe(host server.HostInterface, resourceAnalyzer stats.ResourceAnalyzer, enableCAdvisorJSONEndpoints bool) { - klog.Infof("starting to listen read-only on %s:%s", ServerAddr, ServerPort) - handler := server.NewServer(host, resourceAnalyzer, nil, enableCAdvisorJSONEndpoints, false, false, false, nil) + klog.Infof("starting to listen read-only on %s:%v", ServerAddr, config.ServerPort) + handler := server.NewServer(host, resourceAnalyzer, nil, enableCAdvisorJSONEndpoints, true, false, false, nil) server := &http.Server{ - Addr: net.JoinHostPort(ServerAddr, ServerPort), + Addr: net.JoinHostPort(ServerAddr, string(config.ServerPort)), Handler: &handler, MaxHeaderBytes: 1 << 20, } |