Merge pull request #12976 from JacobTanenbaum/BZ1414956

OpenShift Bot · web-flow · commit ffdaf6d55b00 · 2017-02-20T13:48:31.000-05:00
Merged by openshift-bot
diff --git a/pkg/route/allocation/simple/plugin.go b/pkg/route/allocation/simple/plugin.go
@@ -2,6 +2,7 @@ package simple
 
 import (
 	"fmt"
+	"strings"
 
 	"github.com/golang/glog"
 	kvalidation "k8s.io/kubernetes/pkg/util/validation"
@@ -50,5 +51,5 @@ func (p *SimpleAllocationPlugin) GenerateHostname(route *routeapi.Route, shard *
 	if len(route.Name) == 0 || len(route.Namespace) == 0 {
 		return ""
 	}
-	return fmt.Sprintf("%s-%s.%s", route.Name, route.Namespace, shard.DNSSuffix)
+	return fmt.Sprintf("%s-%s.%s", strings.Replace(route.Name, ".", "-", -1), route.Namespace, shard.DNSSuffix)
 }

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ package simple`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"fmt"`
	`5`	`+ "strings"`
`5`	`6`
`6`	`7`	`"github.com/golang/glog"`
`7`	`8`	`kvalidation "k8s.io/kubernetes/pkg/util/validation"`
`@@ -50,5 +51,5 @@ func (p SimpleAllocationPlugin) GenerateHostname(route routeapi.Route, shard *`
`50`	`51`	`if len(route.Name) == 0 \|\| len(route.Namespace) == 0 {`
`51`	`52`	`return ""`
`52`	`53`	`}`
`53`		`- return fmt.Sprintf("%s-%s.%s", route.Name, route.Namespace, shard.DNSSuffix)`
	`54`	`+ return fmt.Sprintf("%s-%s.%s", strings.Replace(route.Name, ".", "-", -1), route.Namespace, shard.DNSSuffix)`
`54`	`55`	`}`