Skip to content

Removed extra tools imports #1304

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-bot merged 1 commit into from
Mar 13, 2015
Merged

Removed extra tools imports #1304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions pkg/build/registry/etcd/etcd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import (
"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
"github.com/GoogleCloudPlatform/kubernetes/pkg/tools"
ktools "github.com/GoogleCloudPlatform/kubernetes/pkg/tools"
"github.com/GoogleCloudPlatform/kubernetes/pkg/watch"

kapi "github.com/GoogleCloudPlatform/kubernetes/pkg/api"
Expand Down Expand Up @@ -61,7 +60,7 @@ func (r *Etcd) ListBuilds(ctx kapi.Context, selector labels.Selector) (*api.Buil

// WatchBuilds begins watching for new, changed, or deleted Builds.
func (r *Etcd) WatchBuilds(ctx kapi.Context, label, field labels.Selector, resourceVersion string) (watch.Interface, error) {
version, err := ktools.ParseWatchResourceVersion(resourceVersion, "build")
version, err := tools.ParseWatchResourceVersion(resourceVersion, "build")
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -196,7 +195,7 @@ func (r *Etcd) DeleteBuildConfig(ctx kapi.Context, id string) error {

// WatchBuildConfigs begins watching for new, changed, or deleted BuildConfigs.
func (r *Etcd) WatchBuildConfigs(ctx kapi.Context, label, field labels.Selector, resourceVersion string) (watch.Interface, error) {
version, err := ktools.ParseWatchResourceVersion(resourceVersion, "buildConfig")
version, err := tools.ParseWatchResourceVersion(resourceVersion, "buildConfig")
if err != nil {
return nil, err
}
Expand Down
5 changes: 2 additions & 3 deletions pkg/deploy/registry/etcd/etcd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import (
kubeetcd "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/etcd"
"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
"github.com/GoogleCloudPlatform/kubernetes/pkg/tools"
ktools "github.com/GoogleCloudPlatform/kubernetes/pkg/tools"
"github.com/GoogleCloudPlatform/kubernetes/pkg/watch"

"github.com/openshift/origin/pkg/deploy/api"
Expand Down Expand Up @@ -112,7 +111,7 @@ func (r *Etcd) DeleteDeployment(ctx kapi.Context, id string) error {

// WatchDeployments begins watching for new, changed, or deleted Deployments.
func (r *Etcd) WatchDeployments(ctx kapi.Context, label, field labels.Selector, resourceVersion string) (watch.Interface, error) {
version, err := ktools.ParseWatchResourceVersion(resourceVersion, "deployment")
version, err := tools.ParseWatchResourceVersion(resourceVersion, "deployment")
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -154,7 +153,7 @@ func (r *Etcd) ListDeploymentConfigs(ctx kapi.Context, label, field labels.Selec

// WatchDeploymentConfigs begins watching for new, changed, or deleted DeploymentConfigs.
func (r *Etcd) WatchDeploymentConfigs(ctx kapi.Context, label, field labels.Selector, resourceVersion string) (watch.Interface, error) {
version, err := ktools.ParseWatchResourceVersion(resourceVersion, "deploymentConfig")
version, err := tools.ParseWatchResourceVersion(resourceVersion, "deploymentConfig")
if err != nil {
return nil, err
}
Expand Down
3 changes: 1 addition & 2 deletions pkg/route/registry/etcd/etcd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import (
"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
kubeetcd "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/etcd"
"github.com/GoogleCloudPlatform/kubernetes/pkg/tools"
ktools "github.com/GoogleCloudPlatform/kubernetes/pkg/tools"
"github.com/GoogleCloudPlatform/kubernetes/pkg/watch"

"github.com/openshift/origin/pkg/route/api"
Expand Down Expand Up @@ -107,7 +106,7 @@ func (registry *Etcd) WatchRoutes(ctx kapi.Context, label, field labels.Selector
return nil, fmt.Errorf("label selectors are not supported on routes yet")
}

version, err := ktools.ParseWatchResourceVersion(resourceVersion, "pod")
version, err := tools.ParseWatchResourceVersion(resourceVersion, "pod")
if err != nil {
return nil, err
}
Expand Down