summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKubeEdge Bot <48982446+kubeedge-bot@users.noreply.github.com>2021-08-31 17:27:20 +0800
committerGitHub <noreply@github.com>2021-08-31 17:27:20 +0800
commitb5f9c57da97bd1d020b50065eddf1fb8b92b88ba (patch)
tree2eba0943a9e1495557039cb608492a3fd0c87043
parentMerge pull request #3072 from orangegzx/fix/handler-messagehandler (diff)
parentfix target kubeletendpoint port in metrics request,the edgecore kubeletedgepo... (diff)
downloadkubeedge-b5f9c57da97bd1d020b50065eddf1fb8b92b88ba.tar.gz
Merge pull request #3075 from fisherxu/automated-cherry-pick-of-#3010-upstream-release-1.8v1.8.0
Automated cherry pick of #3010: fix target kubeletendpoint port in metrics request,the
-rw-r--r--cloud/pkg/cloudstream/containermetrics_connection.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/cloud/pkg/cloudstream/containermetrics_connection.go b/cloud/pkg/cloudstream/containermetrics_connection.go
index 4b4421b58..7122b58e8 100644
--- a/cloud/pkg/cloudstream/containermetrics_connection.go
+++ b/cloud/pkg/cloudstream/containermetrics_connection.go
@@ -21,11 +21,12 @@ import (
"fmt"
"io"
"net"
- "strings"
+ "strconv"
"github.com/emicklei/go-restful"
"k8s.io/klog/v2"
+ "github.com/kubeedge/kubeedge/common/constants"
"github.com/kubeedge/kubeedge/pkg/stream"
)
@@ -74,9 +75,8 @@ func (ms *ContainerMetricsConnection) SendConnection() (stream.EdgedConnection,
URL: *ms.r.Request.URL,
Header: ms.r.Request.Header,
}
- targetPort := strings.Split(ms.r.Request.Host, ":")[1]
connector.URL.Scheme = httpScheme
- connector.URL.Host = net.JoinHostPort(defaultServerHost, targetPort)
+ connector.URL.Host = net.JoinHostPort(defaultServerHost, strconv.Itoa(constants.ServerPort))
m, err := connector.CreateConnectMessage()
if err != nil {
return nil, err