diff --git a/pkg/proxy/service_port_name.go b/pkg/proxy/service_port_name.go deleted file mode 100644 index 9ac763d3abd..00000000000 --- a/pkg/proxy/service_port_name.go +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright 2015 The Kubernetes Authors All rights reserved. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package proxy - -import ( - "fmt" - - "k8s.io/kubernetes/pkg/types" -) - -// ServicePortName carries a namespace + name + portname. This is the unique -// identfier for a load-balanced service. -type ServicePortName struct { - types.NamespacedName - Port string -} - -func (spn ServicePortName) String() string { - return fmt.Sprintf("%s:%s", spn.NamespacedName.String(), spn.Port) -} diff --git a/pkg/proxy/proxy_provider.go b/pkg/proxy/types.go similarity index 76% rename from pkg/proxy/proxy_provider.go rename to pkg/proxy/types.go index 161a6fc0720..fb759db744d 100644 --- a/pkg/proxy/proxy_provider.go +++ b/pkg/proxy/types.go @@ -17,7 +17,10 @@ limitations under the License. package proxy import ( + "fmt" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/types" ) // ProxyProvider is the interface provided by proxier implementations. @@ -31,3 +34,14 @@ type ProxyProvider interface { // It does not return. SyncLoop() } + +// ServicePortName carries a namespace + name + portname. This is the unique +// identfier for a load-balanced service. +type ServicePortName struct { + types.NamespacedName + Port string +} + +func (spn ServicePortName) String() string { + return fmt.Sprintf("%s:%s", spn.NamespacedName.String(), spn.Port) +}