Merge pull request #258 from lavalamp/misc_cleanup

Use net.JoinHostPort

pkg/kubelet/kubelet.go

@@ -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,

pkg/kubelet/kubelet_test.go

@@ -898,8 +898,9 @@ func TestWatchEtcd(t *testing.T) {
 	close(updateChannel)
 
 	read := reader.GetList()
-	if len(read) != 1 ||
-		!reflect.DeepEqual(read[0], manifest) {
+	if len(read) != 1 {
+		t.Errorf("Expected number of results: %v", len(read))
+	} else if !reflect.DeepEqual(read[0], manifest) {
 		t.Errorf("Unexpected manifest(s) %#v %#v", read[0], manifest)
 	}
 }

pkg/registry/endpoints.go

@@ -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,