Merge pull request #3749 from smarterclayton/wrong_name_for_dns

OpenShift Bot · OpenShift Bot · commit a247971c26ee · 2015-07-19T19:49:18.000-04:00
Merged by openshift-bot
diff --git a/pkg/cmd/server/api/v1/conversions.go b/pkg/cmd/server/api/v1/conversions.go
@@ -26,7 +26,7 @@ func init() {
 				obj.PolicyConfig.OpenShiftInfrastructureNamespace = bootstrappolicy.DefaultOpenShiftInfraNamespace
 			}
 			if len(obj.RoutingConfig.Subdomain) == 0 {
-				obj.RoutingConfig.Subdomain = "router.default.local"
+				obj.RoutingConfig.Subdomain = "router.default.svc.cluster.local"
 			}
 		},
 		func(obj *KubernetesMasterConfig) {

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ func init() {`
`26`	`26`	`obj.PolicyConfig.OpenShiftInfrastructureNamespace = bootstrappolicy.DefaultOpenShiftInfraNamespace`
`27`	`27`	`}`
`28`	`28`	`if len(obj.RoutingConfig.Subdomain) == 0 {`
`29`		`- obj.RoutingConfig.Subdomain = "router.default.local"`
	`29`	`+ obj.RoutingConfig.Subdomain = "router.default.svc.cluster.local"`
`30`	`30`	`}`
`31`	`31`	`},`
`32`	`32`	`func(obj *KubernetesMasterConfig) {`