@@ -34,6 +34,10 @@ type NodeConfig struct {

 	// If you're describing a set of static nodes to the master, this value must match one of the values in the list

 	NodeName string

+	// Node may have multiple IPs, specify the IP to use for pod traffic routing

+	// If not specified, network parse/lookup on the nodeName is performed and the first non-loopback address is used

+	NodeIP string

+

 	// ServingInfo describes how to start serving

 	ServingInfo ServingInfo

@@ -15,6 +15,10 @@ type NodeConfig struct {

 	// If you're describing a set of static nodes to the master, this value must match one of the values in the list

 	NodeName string `json:"nodeName"`

+	// Node may have multiple IPs, specify the IP to use for pod traffic routing

+	// If not specified, network parse/lookup on the nodeName is performed and the first non-loopback address is used

+	NodeIP string `json:"nodeIP"`

+

 	// ServingInfo describes how to start serving

 	ServingInfo ServingInfo `json:"servingInfo"`

@@ -29,6 +29,7 @@ masterKubeConfig: ""

 networkConfig:

   mtu: 0

   networkPluginName: ""

+nodeIP: ""

 nodeName: ""

 podManifestConfig:

   fileCheckIntervalSeconds: 0

@@ -16,6 +16,9 @@ func ValidateNodeConfig(config *api.NodeConfig) fielderrors.ValidationErrorList

 	if len(config.NodeName) == 0 {

 		allErrs = append(allErrs, fielderrors.NewFieldRequired("nodeName"))

 	}

+	if len(config.NodeIP) > 0 {

+		allErrs = append(allErrs, ValidateSpecifiedIP(config.NodeIP, "nodeIP")...)

+	}

 	allErrs = append(allErrs, ValidateServingInfo(config.ServingInfo).Prefix("servingInfo")...)

 	if config.ServingInfo.BindNetwork == "tcp6" {

@@ -102,7 +102,15 @@ func BuildKubernetesNodeConfig(options configapi.NodeConfig) (*NodeConfig, error

 	server := kapp.NewKubeletServer()

 	server.Config = path

 	server.RootDirectory = options.VolumeDirectory

-	server.HostnameOverride = options.NodeName

+

+	// kubelet finds the node IP address by doing net.ParseIP(hostname) and if that fails,

+	// it does net.LookupIP(NodeName) and picks the first non-loopback address.

+	// Pass node IP as hostname to make kubelet use the desired IP address.

+	if len(options.NodeIP) > 0 {

+		server.HostnameOverride = options.NodeIP

+	} else {

+		server.HostnameOverride = options.NodeName

+	}

 	server.AllowPrivileged = true

 	server.RegisterNode = true

 	server.Address = kubeAddress

@@ -139,6 +147,7 @@ func BuildKubernetesNodeConfig(options configapi.NodeConfig) (*NodeConfig, error

 	}

 	// provide any config overrides

+	cfg.NodeName = options.NodeName

 	cfg.StreamingConnectionIdleTimeout = 5 * time.Minute // TODO: should be set

 	cfg.KubeClient = kubeClient

 	cfg.DockerExecHandler = dockerExecHandler

@@ -249,13 +249,13 @@ func RunSDNController(config *kubernetes.NodeConfig, nodeConfig configapi.NodeCo

 	case flatsdn.NetworkPluginName():

 		ch := make(chan struct{})

 		config.KubeletConfig.StartUpdates = ch

-		go flatsdn.Node(oclient, config.Client, nodeConfig.NodeName, "", ch, nodeConfig.NetworkConfig.MTU)

+		go flatsdn.Node(oclient, config.Client, nodeConfig.NodeName, nodeConfig.NodeIP, ch, nodeConfig.NetworkConfig.MTU)

 	case multitenant.NetworkPluginName():

 		ch := make(chan struct{})

 		config.KubeletConfig.StartUpdates = ch

 		plugin := multitenant.GetKubeNetworkPlugin()

 		config.KubeletConfig.NetworkPlugins = append(config.KubeletConfig.NetworkPlugins, plugin)

-		go multitenant.Node(oclient, config.Client, nodeConfig.NodeName, "", ch, plugin, nodeConfig.NetworkConfig.MTU)

+		go multitenant.Node(oclient, config.Client, nodeConfig.NodeName, nodeConfig.NodeIP, ch, plugin, nodeConfig.NetworkConfig.MTU)

 	}

 }