Add routingConfig.subdomain to master config

pkg/cmd/server/api/types.go

@@ -144,6 +144,9 @@ type MasterConfig struct {
 	// ProjectConfig holds information about project creation and defaults
 	ProjectConfig ProjectConfig
 
+	// RoutingConfig holds information about routing and route generation
+	RoutingConfig RoutingConfig
+
 	// NetworkConfig to be passed to the compiled in network plugin
 	NetworkConfig NetworkConfig
 }
@@ -164,6 +167,11 @@ type ProjectConfig struct {
 	SecurityAllocator *SecurityAllocator
 }
 
+type RoutingConfig struct {
+	// Subdomain is the suffix appended to $service.$namespace. to form the default route hostname
+	Subdomain string
+}
+
 type SecurityAllocator struct {
 	// UIDAllocatorRange defines the total set of Unix user IDs (UIDs) that will be allocated to projects automatically, and the size of the
 	// block each namespace gets. For example, 1000-1999/10 will allocate ten UIDs per namespace, and will be able to allocate up to 100 blocks

pkg/cmd/server/api/v1/conversions.go

@@ -22,6 +22,9 @@ func init() {
 			if len(obj.PolicyConfig.OpenShiftInfrastructureNamespace) == 0 {
 				obj.PolicyConfig.OpenShiftInfrastructureNamespace = bootstrappolicy.DefaultOpenShiftInfraNamespace
 			}
+			if len(obj.RoutingConfig.Subdomain) == 0 {
+				obj.RoutingConfig.Subdomain = "router.default.local"
+			}
 		},
 		func(obj *KubernetesMasterConfig) {
 			if obj.MasterCount == 0 {

pkg/cmd/server/api/v1/types.go

@@ -133,6 +133,9 @@ type MasterConfig struct {
 	// ProjectConfig holds information about project creation and defaults
 	ProjectConfig ProjectConfig `json:"projectConfig"`
 
+	// RoutingConfig holds information about routing and route generation
+	RoutingConfig RoutingConfig `json:"routingConfig"`
+
 	// NetworkConfig to be passed to the compiled in network plugin
 	NetworkConfig NetworkConfig `json:"networkConfig"`
 }
@@ -186,6 +189,11 @@ type PolicyConfig struct {
 	OpenShiftInfrastructureNamespace string `json:"openshiftInfrastructureNamespace"`
 }
 
+type RoutingConfig struct {
+	// Subdomain is the suffix appended to $service.$namespace. to form the default route hostname
+	Subdomain string `json:"subdomain"`
+}
+
 // NetworkConfig to be passed to the compiled in network plugin
 type NetworkConfig struct {
 	NetworkPluginName  string `json:"networkPluginName"`

pkg/cmd/server/api/v1/types_test.go

@@ -209,6 +209,8 @@ projectConfig:
   projectRequestMessage: ""
   projectRequestTemplate: ""
   securityAllocator: null
+routingConfig:
+  subdomain: ""
 serviceAccountConfig:
   managedNames: null
   privateKeyFile: ""

pkg/cmd/server/api/validation/master.go

@@ -135,6 +135,8 @@ func ValidateMasterConfig(config *api.MasterConfig) ValidationResults {
 
 	validationResults.AddErrors(ValidateProjectConfig(config.ProjectConfig).Prefix("projectConfig")...)
 
+	validationResults.AddErrors(ValidateRoutingConfig(config.RoutingConfig).Prefix("routingConfig")...)
+
 	validationResults.Append(ValidateAPILevels(config.APILevels, api.KnownOpenShiftAPILevels, api.DeadOpenShiftAPILevels, "apiLevels"))
 
 	return validationResults
@@ -361,3 +363,15 @@ func ValidateProjectConfig(config api.ProjectConfig) fielderrors.ValidationError
 	}
 	return allErrs
 }
+
+func ValidateRoutingConfig(config api.RoutingConfig) fielderrors.ValidationErrorList {
+	allErrs := fielderrors.ValidationErrorList{}
+
+	if len(config.Subdomain) == 0 {
+		allErrs = append(allErrs, fielderrors.NewFieldRequired("subdomain"))
+	} else if !util.IsDNS1123Subdomain(config.Subdomain) {
+		allErrs = append(allErrs, fielderrors.NewFieldInvalid("subdomain", config.Subdomain, "must be a valid subdomain"))
+	}
+
+	return allErrs
+}

pkg/cmd/server/origin/master.go

@@ -134,7 +134,6 @@ const (
 	OpenShiftAPIV1            = "v1"
 	OpenShiftAPIPrefixV1Beta3 = LegacyOpenShiftAPIPrefix + "/" + OpenShiftAPIV1Beta3
 	OpenShiftAPIPrefixV1      = OpenShiftAPIPrefix + "/" + OpenShiftAPIV1
-	OpenShiftRouteSubdomain   = "router.default.local"
 	swaggerAPIPrefix          = "/swaggerapi/"
 )
 
@@ -1108,9 +1107,7 @@ func (c *MasterConfig) RouteAllocator() *routeallocationcontroller.RouteAllocati
 		KubeClient: kclient,
 	}
 
-	subdomain := env("OPENSHIFT_ROUTE_SUBDOMAIN", OpenShiftRouteSubdomain)
-
-	plugin, err := routeplugin.NewSimpleAllocationPlugin(subdomain)
+	plugin, err := routeplugin.NewSimpleAllocationPlugin(c.Options.RoutingConfig.Subdomain)
 	if err != nil {
 		glog.Fatalf("Route plugin initialization failed: %v", err)
 	}