Skip to content
This repository has been archived by the owner on May 6, 2022. It is now read-only.

change pmorie lib import to kubernetes-sigs location #2702

Merged
merged 1 commit into from
Sep 10, 2019
Merged

change pmorie lib import to kubernetes-sigs location #2702

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
29 changes: 14 additions & 15 deletions Gopkg.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Gopkg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ required = [
]

[[constraint]]
name = "github.com/pmorie/go-open-service-broker-client"
revision = "a894d21a6d93b2b01b434b2226d806cc1240f79d"
name = "github.com/kubernetes-sigs/go-open-service-broker-client"
revision = "906fa5f9c24914e93e61f0dee2e417b2b24f77bd"

# All dependencies of Kubernetes from branch release-1.13 converted to override clauses. This include dependencies that
# are not used in this project. See
Expand Down
2 changes: 1 addition & 1 deletion cmd/controller-manager/app/options/options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ import (
"github.com/spf13/pflag"
utilfeature "k8s.io/apiserver/pkg/util/feature"

osb "github.com/kubernetes-sigs/go-open-service-broker-client/v2"
"github.com/kubernetes-sigs/service-catalog/pkg/apis/componentconfig"
"github.com/kubernetes-sigs/service-catalog/pkg/controller"
k8scomponentconfig "github.com/kubernetes-sigs/service-catalog/pkg/kubernetes/pkg/apis/componentconfig"
"github.com/kubernetes-sigs/service-catalog/pkg/kubernetes/pkg/client/leaderelectionconfig"
osb "github.com/pmorie/go-open-service-broker-client/v2"
genericoptions "k8s.io/apiserver/pkg/server/options"
)

Expand Down
2 changes: 1 addition & 1 deletion contrib/pkg/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
These packages contain code which is used to build a broker used to test the
service-catalog project. These packages are **NOT** intended to represent a
fully up-to-date version of the API. The client library used by the service-
catalog is [here](https://github.com/pmorie/go-open-service-broker-client).
catalog is [here](https://github.com/kubernetes-sigs/go-open-service-broker-client).

These packages are also **NOT** intended to represent a framework or library
that should be used to create new brokers or used as a client to talk to
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/broker_client_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"reflect"
"sync"

osb "github.com/pmorie/go-open-service-broker-client/v2"
osb "github.com/kubernetes-sigs/go-open-service-broker-client/v2"
"k8s.io/klog"
)

Expand Down
5 changes: 3 additions & 2 deletions pkg/controller/broker_client_manager_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@ limitations under the License.
package controller_test

import (
"github.com/kubernetes-sigs/service-catalog/pkg/controller"
osb "github.com/pmorie/go-open-service-broker-client/v2"
"testing"

osb "github.com/kubernetes-sigs/go-open-service-broker-client/v2"
"github.com/kubernetes-sigs/service-catalog/pkg/controller"
)

func TestBrokerClientManager_CreateBrokerClient(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions pkg/controller/case_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ import (

"sync"

osb "github.com/kubernetes-sigs/go-open-service-broker-client/v2"
fakeosb "github.com/kubernetes-sigs/go-open-service-broker-client/v2/fake"
"github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/v1beta1"
fakesc "github.com/kubernetes-sigs/service-catalog/pkg/client/clientset_generated/clientset/fake"
scinterface "github.com/kubernetes-sigs/service-catalog/pkg/client/clientset_generated/clientset/typed/servicecatalog/v1beta1"
scinformers "github.com/kubernetes-sigs/service-catalog/pkg/client/informers_generated/externalversions"
"github.com/kubernetes-sigs/service-catalog/pkg/controller"
scfeatures "github.com/kubernetes-sigs/service-catalog/pkg/features"
osb "github.com/pmorie/go-open-service-broker-client/v2"
fakeosb "github.com/pmorie/go-open-service-broker-client/v2/fake"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
corev1 "k8s.io/api/core/v1"
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"sync"
"time"

osb "github.com/pmorie/go-open-service-broker-client/v2"
osb "github.com/kubernetes-sigs/go-open-service-broker-client/v2"
"k8s.io/klog"

"k8s.io/apimachinery/pkg/api/errors"
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/controller_actions_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"fmt"
"reflect"

fakeosb "github.com/kubernetes-sigs/go-open-service-broker-client/v2/fake"
"github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/v1beta1"
fakeosb "github.com/pmorie/go-open-service-broker-client/v2/fake"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/client-go/testing"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/controller_binding.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"fmt"
"net"

osb "github.com/pmorie/go-open-service-broker-client/v2"
osb "github.com/kubernetes-sigs/go-open-service-broker-client/v2"
utilfeature "k8s.io/apiserver/pkg/util/feature"
"k8s.io/klog"

Expand Down
4 changes: 2 additions & 2 deletions pkg/controller/controller_binding_ns_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ import (
"net/http"
"testing"

osb "github.com/kubernetes-sigs/go-open-service-broker-client/v2"
fakeosb "github.com/kubernetes-sigs/go-open-service-broker-client/v2/fake"
"github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/v1beta1"
v1beta1informers "github.com/kubernetes-sigs/service-catalog/pkg/client/informers_generated/externalversions/servicecatalog/v1beta1"
scfeatures "github.com/kubernetes-sigs/service-catalog/pkg/features"
osb "github.com/pmorie/go-open-service-broker-client/v2"
fakeosb "github.com/pmorie/go-open-service-broker-client/v2/fake"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
Expand Down
4 changes: 2 additions & 2 deletions pkg/controller/controller_binding_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ import (
"testing"
"time"

osb "github.com/kubernetes-sigs/go-open-service-broker-client/v2"
fakeosb "github.com/kubernetes-sigs/go-open-service-broker-client/v2/fake"
scmeta "github.com/kubernetes-sigs/service-catalog/pkg/api/meta"
"github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/v1beta1"
v1beta1informers "github.com/kubernetes-sigs/service-catalog/pkg/client/informers_generated/externalversions/servicecatalog/v1beta1"
sctestutil "github.com/kubernetes-sigs/service-catalog/test/util"
osb "github.com/pmorie/go-open-service-broker-client/v2"
fakeosb "github.com/pmorie/go-open-service-broker-client/v2/fake"
corev1 "k8s.io/api/core/v1"

apierrors "k8s.io/apimachinery/pkg/api/errors"
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/controller_clusterservicebroker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ import (
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/client-go/tools/cache"

osb "github.com/kubernetes-sigs/go-open-service-broker-client/v2"
"github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/v1beta1"
"github.com/kubernetes-sigs/service-catalog/pkg/metrics"
"github.com/kubernetes-sigs/service-catalog/pkg/pretty"
osb "github.com/pmorie/go-open-service-broker-client/v2"
)

// the Message strings have a terminating period and space so they can
Expand Down
4 changes: 2 additions & 2 deletions pkg/controller/controller_clusterservicebroker_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"testing"
"time"

osb "github.com/pmorie/go-open-service-broker-client/v2"
fakeosb "github.com/pmorie/go-open-service-broker-client/v2/fake"
osb "github.com/kubernetes-sigs/go-open-service-broker-client/v2"
fakeosb "github.com/kubernetes-sigs/go-open-service-broker-client/v2/fake"

"github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/v1beta1"
"github.com/kubernetes-sigs/service-catalog/test/fake"
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/controller_flow_binding_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ import (
"testing"
"time"

"github.com/kubernetes-sigs/go-open-service-broker-client/v2"
"github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/v1beta1"
scfeatures "github.com/kubernetes-sigs/service-catalog/pkg/features"
"github.com/pmorie/go-open-service-broker-client/v2"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
utilfeature "k8s.io/apiserver/pkg/util/feature"
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/controller_flow_instance_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import (
"net/url"
"testing"

"github.com/kubernetes-sigs/go-open-service-broker-client/v2"
"github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/v1beta1"
"github.com/pmorie/go-open-service-broker-client/v2"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/controller_instance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"sync"
"time"

osb "github.com/pmorie/go-open-service-broker-client/v2"
osb "github.com/kubernetes-sigs/go-open-service-broker-client/v2"
"k8s.io/klog"

corev1 "k8s.io/api/core/v1"
Expand Down
4 changes: 2 additions & 2 deletions pkg/controller/controller_instance_ns_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"fmt"
"testing"

osb "github.com/pmorie/go-open-service-broker-client/v2"
fakeosb "github.com/pmorie/go-open-service-broker-client/v2/fake"
osb "github.com/kubernetes-sigs/go-open-service-broker-client/v2"
fakeosb "github.com/kubernetes-sigs/go-open-service-broker-client/v2/fake"

"github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/v1beta1"

Expand Down
4 changes: 2 additions & 2 deletions pkg/controller/controller_instance_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ import (
"testing"
"time"

osb "github.com/pmorie/go-open-service-broker-client/v2"
fakeosb "github.com/pmorie/go-open-service-broker-client/v2/fake"
osb "github.com/kubernetes-sigs/go-open-service-broker-client/v2"
fakeosb "github.com/kubernetes-sigs/go-open-service-broker-client/v2/fake"

"github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/v1beta1"

Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/controller_servicebroker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ import (
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/client-go/tools/cache"

osb "github.com/kubernetes-sigs/go-open-service-broker-client/v2"
"github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/v1beta1"
"github.com/kubernetes-sigs/service-catalog/pkg/metrics"
"github.com/kubernetes-sigs/service-catalog/pkg/pretty"
osb "github.com/pmorie/go-open-service-broker-client/v2"
)

// the Message strings have a terminating period and space so they can
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/controller_servicebroker_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
scfeatures "github.com/kubernetes-sigs/service-catalog/pkg/features"
"github.com/kubernetes-sigs/service-catalog/test/fake"

osb "github.com/pmorie/go-open-service-broker-client/v2"
osb "github.com/kubernetes-sigs/go-open-service-broker-client/v2"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/fields"
Expand Down
4 changes: 2 additions & 2 deletions pkg/controller/controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import (
"testing"
"time"

osb "github.com/pmorie/go-open-service-broker-client/v2"
fakeosb "github.com/pmorie/go-open-service-broker-client/v2/fake"
osb "github.com/kubernetes-sigs/go-open-service-broker-client/v2"
fakeosb "github.com/kubernetes-sigs/go-open-service-broker-client/v2/fake"
"sigs.k8s.io/yaml"

"github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/v1beta1"
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/originating_identity.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ package controller
import (
"encoding/json"

osb "github.com/kubernetes-sigs/go-open-service-broker-client/v2"
"github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/v1beta1"
osb "github.com/pmorie/go-open-service-broker-client/v2"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/originating_identity_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"reflect"
"testing"

osb "github.com/kubernetes-sigs/go-open-service-broker-client/v2"
"github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/v1beta1"
osb "github.com/pmorie/go-open-service-broker-client/v2"
)

func TestBuildOriginatingIdentity(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/metrics/osbclientproxy/osbproxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ package osbclientproxy
import (
"fmt"

osb "github.com/kubernetes-sigs/go-open-service-broker-client/v2"
"github.com/kubernetes-sigs/service-catalog/pkg/metrics"
osb "github.com/pmorie/go-open-service-broker-client/v2"
"k8s.io/klog"
)

Expand Down
4 changes: 2 additions & 2 deletions test/integration/controller_binding_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ import (

_ "github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/install"

osb "github.com/pmorie/go-open-service-broker-client/v2"
fakeosb "github.com/pmorie/go-open-service-broker-client/v2/fake"
osb "github.com/kubernetes-sigs/go-open-service-broker-client/v2"
fakeosb "github.com/kubernetes-sigs/go-open-service-broker-client/v2/fake"

"time"

Expand Down
4 changes: 2 additions & 2 deletions test/integration/controller_instance_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

scfeatures "github.com/kubernetes-sigs/service-catalog/pkg/features"
osb "github.com/pmorie/go-open-service-broker-client/v2"
fakeosb "github.com/pmorie/go-open-service-broker-client/v2/fake"
osb "github.com/kubernetes-sigs/go-open-service-broker-client/v2"
fakeosb "github.com/kubernetes-sigs/go-open-service-broker-client/v2/fake"
utilfeature "k8s.io/apiserver/pkg/util/feature"

// avoid error `servicecatalog/v1beta1 is not enabled`
Expand Down
6 changes: 3 additions & 3 deletions test/integration/controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ import (
// avoid error `servicecatalog/v1beta1 is not enabled`
_ "github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/install"

osb "github.com/pmorie/go-open-service-broker-client/v2"
fakeosb "github.com/pmorie/go-open-service-broker-client/v2/fake"
generator "github.com/pmorie/go-open-service-broker-client/v2/generator"
osb "github.com/kubernetes-sigs/go-open-service-broker-client/v2"
fakeosb "github.com/kubernetes-sigs/go-open-service-broker-client/v2/fake"
generator "github.com/kubernetes-sigs/go-open-service-broker-client/v2/generator"

"github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog"
"github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/v1beta1"
Expand Down
4 changes: 2 additions & 2 deletions test/integration/filtered_services_and_plans_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ import (

// avoid error `servicecatalog/v1beta1 is not enabled`
_ "github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/install"
fakeosb "github.com/pmorie/go-open-service-broker-client/v2/fake"
fakeosb "github.com/kubernetes-sigs/go-open-service-broker-client/v2/fake"

"time"

"github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/v1beta1"
"github.com/kubernetes-sigs/service-catalog/test/util"
"github.com/pmorie/go-open-service-broker-client/v2/generator"
"github.com/kubernetes-sigs/go-open-service-broker-client/v2/generator"
)

func TestClusterServiceClassRemovedFromCatalogAfterFiltering(t *testing.T) {
Expand Down
0 ...rie/go-open-service-broker-client/LICENSE → ...igs/go-open-service-broker-client/LICENSE
View file
Open in desktop
File renamed without changes.
16 changes: 16 additions & 0 deletions .../go-open-service-broker-client/v2/bind.go → .../go-open-service-broker-client/v2/bind.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading