@@ -1,6 +1,7 @@

 package validation

 import (

+	"fmt"

 	"net"

 	"net/url"

 	"strings"

@@ -144,6 +145,12 @@ func ValidateKubernetesMasterConfig(config *api.KubernetesMasterConfig) fielderr

 		allErrs = append(allErrs, ValidateFile(config.SchedulerConfigFile, "schedulerConfigFile")...)

 	}

+	for i, nodeName := range config.StaticNodeNames {

+		if len(nodeName) == 0 {

+			allErrs = append(allErrs, fielderrors.NewFieldInvalid(fmt.Sprintf("staticNodeName[%d]", i), nodeName, "may not be empty"))

+		}

+	}

+

 	return allErrs

 }

@@ -338,10 +338,13 @@ func (args MasterArgs) BuildSerializeableKubeMasterConfig() (*configapi.Kubernet

 		masterIP = ip.String()

 	}

+	staticNodeList := util.NewStringSet(args.NodeList...)

+	staticNodeList.Delete("")

+

 	config := &configapi.KubernetesMasterConfig{

 		MasterIP:            masterIP,

 		ServicesSubnet:      servicesSubnet.String(),

-		StaticNodeNames:     args.NodeList,

+		StaticNodeNames:     staticNodeList.List(),

 		SchedulerConfigFile: args.SchedulerConfigFile,

 	}