Merge pull request #1019 from skitt/dns-suffix

openshift-merge-robot · web-flow · commit 8395ab78b418 · 2019-09-05T19:08:10.000+02:00
Bug 1748914: Drop the hard-coded DNS suffix
diff --git a/pkg/api/apis/operators/catalogsource_types.go b/pkg/api/apis/operators/catalogsource_types.go
@@ -74,7 +74,7 @@ type GRPCConnectionState struct {
 }
 
 func (s *RegistryServiceStatus) Address() string {
-	return fmt.Sprintf("%s.%s.svc.cluster.local:%s", s.ServiceName, s.ServiceNamespace, s.Port)
+	return fmt.Sprintf("%s.%s.svc:%s", s.ServiceName, s.ServiceNamespace, s.Port)
 }
 
 type CatalogSourceStatus struct {
diff --git a/pkg/api/apis/operators/v1alpha1/catalogsource_types.go b/pkg/api/apis/operators/v1alpha1/catalogsource_types.go
@@ -75,7 +75,7 @@ type RegistryServiceStatus struct {
 }
 
 func (s *RegistryServiceStatus) Address() string {
-	return fmt.Sprintf("%s.%s.svc.cluster.local:%s", s.ServiceName, s.ServiceNamespace, s.Port)
+	return fmt.Sprintf("%s.%s.svc:%s", s.ServiceName, s.ServiceNamespace, s.Port)
 }
 
 type GRPCConnectionState struct {

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ type GRPCConnectionState struct {`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`func (s *RegistryServiceStatus) Address() string {`
`77`		`- return fmt.Sprintf("%s.%s.svc.cluster.local:%s", s.ServiceName, s.ServiceNamespace, s.Port)`
	`77`	`+ return fmt.Sprintf("%s.%s.svc:%s", s.ServiceName, s.ServiceNamespace, s.Port)`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`type CatalogSourceStatus struct {`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ type RegistryServiceStatus struct {`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`func (s *RegistryServiceStatus) Address() string {`
`78`		`- return fmt.Sprintf("%s.%s.svc.cluster.local:%s", s.ServiceName, s.ServiceNamespace, s.Port)`
	`78`	`+ return fmt.Sprintf("%s.%s.svc:%s", s.ServiceName, s.ServiceNamespace, s.Port)`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`type GRPCConnectionState struct {`