github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use KubeletPort reporeted in NodeStatus instead of cluster-wide master config.

Browse Source
This commit is contained in:
gmarek
2015-08-13 16:05:32 +02:00
parent e9dc7306cc
commit 6d6cd8e46a
14 changed files with 193 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/registry/node/strategy.go
View File

@@ -153,17 +153,30 @@ func ResourceLocation(getter ResourceGetter, connection client.ConnectionInfoGet
}
host := hostIP.String()
if portReq == "" || strconv.Itoa(ports.KubeletPort) == portReq {
// Ignore requested scheme, use scheme provided by GetConnectionInfo
// We check if we want to get a default Kubelet's transport. It happens if either:
// - no port is specified in request (Kubelet's port is default),
// - we're using Port stored as a DaemonEndpoint and requested port is a Kubelet's port stored in the DaemonEndpoint,
// - there's no information in the API about DaemonEnpoint (legacy cluster) and requested port is equal to ports.KubeletPort (cluster-wide config)
defaultKubeletPort := node.Status.DaemonEndpoints.KubeletEndpoint.Port
if defaultKubeletPort == 0 {
defaultKubeletPort = ports.KubeletPort
}
if portReq == "" || strconv.Itoa(defaultKubeletPort) == portReq {
scheme, port, kubeletTransport, err := connection.GetConnectionInfo(host)
if err != nil {
return nil, nil, err
}
var portString string
if node.Status.DaemonEndpoints.KubeletEndpoint.Port != 0 {
portString = strconv.Itoa(node.Status.DaemonEndpoints.KubeletEndpoint.Port)
} else {
portString = strconv.FormatUint(uint64(port), 10)
}
return &url.URL{
Scheme: scheme,
Host: net.JoinHostPort(
host,
strconv.FormatUint(uint64(port), 10),
portString,
),
},
kubeletTransport,