Merge pull request #12478 from eparis/use-pflag-network

Use pflags for net.IP and net.IPNet instead of custom flag types
This commit is contained in:
Alex Robinson
2015-08-10 11:55:54 -07:00
9 changed files with 60 additions and 231 deletions

View File

@@ -96,7 +96,7 @@ func NewKubeletExecutorServer() *KubeletExecutorServer {
} else {
k.RootDirectory = pwd // mesos sandbox dir
}
k.Address = util.IP(net.ParseIP(defaultBindingAddress()))
k.Address = net.ParseIP(defaultBindingAddress())
k.ShutdownFD = -1 // indicates unspecified FD
return k
@@ -404,7 +404,7 @@ func (ks *KubeletExecutorServer) createAndInitKubelet(
dconfig := bindings.DriverConfig{
Executor: exec,
HostnameOverride: ks.HostnameOverride,
BindingAddress: net.IP(ks.Address),
BindingAddress: ks.Address,
}
if driver, err := bindings.NewMesosExecutorDriver(dconfig); err != nil {
log.Fatalf("failed to create executor driver: %v", err)
@@ -427,7 +427,7 @@ type kubeletExecutor struct {
*kubelet.Kubelet
initialize sync.Once
driver bindings.ExecutorDriver
address util.IP
address net.IP
dockerClient dockertools.DockerInterface
hks hyperkube.Interface
kubeletFinished chan struct{} // closed once kubelet.Run() returns