mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 20:24:09 +00:00
Use net.JoinHostPort
This commit is contained in:
parent
de06869d30
commit
001b07b292
@ -21,6 +21,7 @@ import (
|
||||
"fmt"
|
||||
"io/ioutil"
|
||||
"math/rand"
|
||||
"net"
|
||||
"net/http"
|
||||
"os"
|
||||
"os/exec"
|
||||
@ -128,8 +129,7 @@ func (kl *Kubelet) RunKubelet(config_path, manifest_url, etcd_servers, address s
|
||||
UpdateChannel: updateChannel,
|
||||
}
|
||||
s := &http.Server{
|
||||
// TODO: This is broken if address is an ipv6 address.
|
||||
Addr: fmt.Sprintf("%s:%d", address, port),
|
||||
Addr: net.JoinHostPort(address, strconv.FormatUint(uint64(port), 10)),
|
||||
Handler: &handler,
|
||||
ReadTimeout: 10 * time.Second,
|
||||
WriteTimeout: 10 * time.Second,
|
||||
|
@ -17,7 +17,8 @@ limitations under the License.
|
||||
package registry
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"net"
|
||||
"strconv"
|
||||
|
||||
"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
|
||||
"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
|
||||
@ -52,7 +53,10 @@ func (e *EndpointController) SyncServiceEndpoints() error {
|
||||
endpoints := make([]string, len(pods))
|
||||
for ix, pod := range pods {
|
||||
// TODO: Use port names in the service object, don't just use port #0
|
||||
endpoints[ix] = fmt.Sprintf("%s:%d", pod.CurrentState.Host, pod.DesiredState.Manifest.Containers[0].Ports[0].HostPort)
|
||||
endpoints[ix] = net.JoinHostPort(
|
||||
pod.CurrentState.Host,
|
||||
strconv.Itoa(pod.DesiredState.Manifest.Containers[0].Ports[0].HostPort),
|
||||
)
|
||||
}
|
||||
err = e.serviceRegistry.UpdateEndpoints(api.Endpoints{
|
||||
Name: service.ID,
|
||||
|
Loading…
Reference in New Issue
Block a user