Merge pull request #1765 from deads2k/deads-disallow-empty-node-names

Merged by openshift-bot
openshift · Apr 16, 2015 · 199355c · 199355c
2 parents b79a3bc + 5789426
commit 199355c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/pkg/cmd/server/api/validation/master.go b/pkg/cmd/server/api/validation/master.go
@@ -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
 }
 

diff --git a/pkg/cmd/server/start/master_args.go b/pkg/cmd/server/start/master_args.go
@@ -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,
 	}