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

Commit

Permalink
Change import paths to kubernetes-sigs, and rebase with master
Browse files Browse the repository at this point in the history
  • Loading branch information
@mszostok
mszostok committed Jun 12, 2019
1 parent e7afce8 commit 797a63a
Show file tree
Hide file tree
Showing 70 changed files with 212 additions and 212 deletions.
2 changes: 1 addition & 1 deletion charts/catalog/values.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Default values for Service Catalog
# service-catalog image to use
image: eu.gcr.io/kyma-project/develop/service-catalog/service-catalog-amd64:crd-0.3.0
image: eu.gcr.io/kyma-project/develop/service-catalog/service-catalog-amd64:crd-0.3.1
# imagePullPolicy for the service-catalog; valid values are "IfNotPresent",
# "Never", and "Always"
imagePullPolicy: Always
Expand Down
4 changes: 2 additions & 2 deletions cmd/cleaner/server/cleaner.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ package server

import (
"fmt"
"github.com/kubernetes-incubator/service-catalog/pkg/cleaner"
sc "github.com/kubernetes-incubator/service-catalog/pkg/client/clientset_generated/clientset"
"github.com/kubernetes-sigs/service-catalog/pkg/cleaner"
sc "github.com/kubernetes-sigs/service-catalog/pkg/client/clientset_generated/clientset"
apiextensionsclientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/rest"
Expand Down
4 changes: 2 additions & 2 deletions cmd/service-catalog/server/cleaner.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ limitations under the License.
package server

import (
"github.com/kubernetes-incubator/service-catalog/cmd/cleaner/server"
"github.com/kubernetes-incubator/service-catalog/pkg/hyperkube"
"github.com/kubernetes-sigs/service-catalog/cmd/cleaner/server"
"github.com/kubernetes-sigs/service-catalog/pkg/hyperkube"
)

// NewCleaner creates a new hyperkube Server object that includes the
Expand Down
4 changes: 2 additions & 2 deletions cmd/service-catalog/server/webhook.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ limitations under the License.
package server

import (
"github.com/kubernetes-incubator/service-catalog/cmd/webhook/server"
"github.com/kubernetes-incubator/service-catalog/pkg/hyperkube"
"github.com/kubernetes-sigs/service-catalog/cmd/webhook/server"
"github.com/kubernetes-sigs/service-catalog/pkg/hyperkube"
)

// NewWebhookServer creates a new hyperkube Server object that includes the
Expand Down
42 changes: 21 additions & 21 deletions cmd/webhook/server/webhook.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,27 +20,27 @@ import (
"fmt"
"net/http"

scTypes "github.com/kubernetes-incubator/service-catalog/pkg/apis/servicecatalog/v1beta1"
csbmutation "github.com/kubernetes-incubator/service-catalog/pkg/webhook/servicecatalog/clusterservicebroker/mutation"
cscmutation "github.com/kubernetes-incubator/service-catalog/pkg/webhook/servicecatalog/clusterserviceclass/mutation"
cspmutation "github.com/kubernetes-incubator/service-catalog/pkg/webhook/servicecatalog/clusterserviceplan/mutation"

sbmutation "github.com/kubernetes-incubator/service-catalog/pkg/webhook/servicecatalog/servicebinding/mutation"
brmutation "github.com/kubernetes-incubator/service-catalog/pkg/webhook/servicecatalog/servicebroker/mutation"
scmutation "github.com/kubernetes-incubator/service-catalog/pkg/webhook/servicecatalog/serviceclass/mutation"
simutation "github.com/kubernetes-incubator/service-catalog/pkg/webhook/servicecatalog/serviceinstance/mutation"
spmutation "github.com/kubernetes-incubator/service-catalog/pkg/webhook/servicecatalog/serviceplan/mutation"

csbrvalidation "github.com/kubernetes-incubator/service-catalog/pkg/webhook/servicecatalog/clusterservicebroker/validation"
cscvalidation "github.com/kubernetes-incubator/service-catalog/pkg/webhook/servicecatalog/clusterserviceclass/validation"
cspvalidation "github.com/kubernetes-incubator/service-catalog/pkg/webhook/servicecatalog/clusterserviceplan/validation"
sbvalidation "github.com/kubernetes-incubator/service-catalog/pkg/webhook/servicecatalog/servicebinding/validation"
sbrvalidation "github.com/kubernetes-incubator/service-catalog/pkg/webhook/servicecatalog/servicebroker/validation"
scvalidation "github.com/kubernetes-incubator/service-catalog/pkg/webhook/servicecatalog/serviceclass/validation"
sivalidation "github.com/kubernetes-incubator/service-catalog/pkg/webhook/servicecatalog/serviceinstance/validation"
spvalidation "github.com/kubernetes-incubator/service-catalog/pkg/webhook/servicecatalog/serviceplan/validation"

"github.com/kubernetes-incubator/service-catalog/pkg/probe"
scTypes "github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/v1beta1"
csbmutation "github.com/kubernetes-sigs/service-catalog/pkg/webhook/servicecatalog/clusterservicebroker/mutation"
cscmutation "github.com/kubernetes-sigs/service-catalog/pkg/webhook/servicecatalog/clusterserviceclass/mutation"
cspmutation "github.com/kubernetes-sigs/service-catalog/pkg/webhook/servicecatalog/clusterserviceplan/mutation"

sbmutation "github.com/kubernetes-sigs/service-catalog/pkg/webhook/servicecatalog/servicebinding/mutation"
brmutation "github.com/kubernetes-sigs/service-catalog/pkg/webhook/servicecatalog/servicebroker/mutation"
scmutation "github.com/kubernetes-sigs/service-catalog/pkg/webhook/servicecatalog/serviceclass/mutation"
simutation "github.com/kubernetes-sigs/service-catalog/pkg/webhook/servicecatalog/serviceinstance/mutation"
spmutation "github.com/kubernetes-sigs/service-catalog/pkg/webhook/servicecatalog/serviceplan/mutation"

csbrvalidation "github.com/kubernetes-sigs/service-catalog/pkg/webhook/servicecatalog/clusterservicebroker/validation"
cscvalidation "github.com/kubernetes-sigs/service-catalog/pkg/webhook/servicecatalog/clusterserviceclass/validation"
cspvalidation "github.com/kubernetes-sigs/service-catalog/pkg/webhook/servicecatalog/clusterserviceplan/validation"
sbvalidation "github.com/kubernetes-sigs/service-catalog/pkg/webhook/servicecatalog/servicebinding/validation"
sbrvalidation "github.com/kubernetes-sigs/service-catalog/pkg/webhook/servicecatalog/servicebroker/validation"
scvalidation "github.com/kubernetes-sigs/service-catalog/pkg/webhook/servicecatalog/serviceclass/validation"
sivalidation "github.com/kubernetes-sigs/service-catalog/pkg/webhook/servicecatalog/serviceinstance/validation"
spvalidation "github.com/kubernetes-sigs/service-catalog/pkg/webhook/servicecatalog/serviceplan/validation"

"github.com/kubernetes-sigs/service-catalog/pkg/probe"
"github.com/pkg/errors"
apiextensionsclientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
"k8s.io/apiserver/pkg/server/healthz"
Expand Down
2 changes: 1 addition & 1 deletion docs/proposals/going-towards-to-crd.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Below you can find our concerns about having a single executable binary that sup
### Business concerns

Adding CRDs via a feature flag directly in a Helm chart can be misleading for the client.
The CRDs approach is not a feature. It is just a new implementation for already existing features. The current [`apiserver.storage.type`: crds/etcd](https://github.com/kubernetes-incubator/service-catalog/blob/master/charts/catalog/values.yaml#L61-L62) configuration indicates that etcd is rather expanding than deprecating. We do not want to make customers think that **CRD** or **etcd** are storage options. Customers should know that the etcd is depreciating and that they should consider switching for CRDs approach as soon as possible.
The CRDs approach is not a feature. It is just a new implementation for already existing features. The current [`apiserver.storage.type`: crds/etcd](https://github.com/kubernetes-sigs/service-catalog/blob/master/charts/catalog/values.yaml#L61-L62) configuration indicates that etcd is rather expanding than deprecating. We do not want to make customers think that **CRD** or **etcd** are storage options. Customers should know that the etcd is depreciating and that they should consider switching for CRDs approach as soon as possible.

Moreover, fixing bugs and adding new features both in Aggregated API Server and CRDs may slow down the development process.

Expand Down
4 changes: 2 additions & 2 deletions pkg/cleaner/cleaner.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ package cleaner

import (
"fmt"
sc "github.com/kubernetes-incubator/service-catalog/pkg/client/clientset_generated/clientset"
"github.com/kubernetes-incubator/service-catalog/pkg/probe"
sc "github.com/kubernetes-sigs/service-catalog/pkg/client/clientset_generated/clientset"
"github.com/kubernetes-sigs/service-catalog/pkg/probe"
apiextensionsclientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/wait"
Expand Down
4 changes: 2 additions & 2 deletions pkg/cleaner/cleaner_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ limitations under the License.
package cleaner

import (
scfake "github.com/kubernetes-incubator/service-catalog/pkg/client/clientset_generated/clientset/fake"
"github.com/kubernetes-incubator/service-catalog/pkg/probe"
scfake "github.com/kubernetes-sigs/service-catalog/pkg/client/clientset_generated/clientset/fake"
"github.com/kubernetes-sigs/service-catalog/pkg/probe"
"github.com/stretchr/testify/assert"
admv1beta1 "k8s.io/api/admissionregistration/v1beta1"
"k8s.io/api/apps/v1beta1"
Expand Down
6 changes: 3 additions & 3 deletions pkg/cleaner/finalizer_cleaner.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ package cleaner

import (
"fmt"
"github.com/kubernetes-incubator/service-catalog/pkg/apis/servicecatalog/v1beta1"
sc "github.com/kubernetes-incubator/service-catalog/pkg/client/clientset_generated/clientset"
"github.com/kubernetes-incubator/service-catalog/pkg/pretty"
"github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/v1beta1"
sc "github.com/kubernetes-sigs/service-catalog/pkg/client/clientset_generated/clientset"
"github.com/kubernetes-sigs/service-catalog/pkg/pretty"
"k8s.io/apimachinery/pkg/api/errors"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/sets"
Expand Down
4 changes: 2 additions & 2 deletions pkg/cleaner/finalizer_cleaner_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ limitations under the License.
package cleaner

import (
"github.com/kubernetes-incubator/service-catalog/pkg/apis/servicecatalog/v1beta1"
scfake "github.com/kubernetes-incubator/service-catalog/pkg/client/clientset_generated/clientset/fake"
"github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/v1beta1"
scfake "github.com/kubernetes-sigs/service-catalog/pkg/client/clientset_generated/clientset/fake"
"github.com/stretchr/testify/assert"
v1 "k8s.io/api/core/v1"
apimachinaryv1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/controller_binding.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"net"
"reflect"

"github.com/kubernetes-incubator/service-catalog/pkg/apis/servicecatalog/v1beta1"
"github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/v1beta1"
scfeatures "github.com/kubernetes-sigs/service-catalog/pkg/features"
"github.com/kubernetes-sigs/service-catalog/pkg/pretty"

Expand Down
2 changes: 1 addition & 1 deletion pkg/svcat/service-catalog/plan.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"strings"

"github.com/hashicorp/go-multierror"
"github.com/kubernetes-incubator/service-catalog/pkg/apis/servicecatalog/v1beta1"
"github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/v1beta1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
Expand Down
4 changes: 2 additions & 2 deletions pkg/webhook/servicecatalog/clusterservicebroker/mutation/handler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"encoding/json"
"net/http"

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

admissionTypes "k8s.io/api/admission/v1beta1"
"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
Expand Down
10 changes: 5 additions & 5 deletions pkg/webhook/servicecatalog/clusterservicebroker/mutation/handler_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import (
"testing"

"github.com/appscode/jsonpatch"
sc "github.com/kubernetes-incubator/service-catalog/pkg/apis/servicecatalog/v1beta1"
"github.com/kubernetes-incubator/service-catalog/pkg/webhook/servicecatalog/clusterservicebroker/mutation"
"github.com/kubernetes-incubator/service-catalog/pkg/webhookutil/tester"
sc "github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/v1beta1"
"github.com/kubernetes-sigs/service-catalog/pkg/webhook/servicecatalog/clusterservicebroker/mutation"
"github.com/kubernetes-sigs/service-catalog/pkg/webhookutil/tester"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
admissionv1beta1 "k8s.io/api/admission/v1beta1"
Expand Down Expand Up @@ -57,7 +57,7 @@ func TestCreateUpdateHandlerHandleCreateSuccess(t *testing.T) {
Operation: "add",
Path: "/metadata/finalizers",
Value: []interface{}{
"kubernetes-incubator/service-catalog",
"kubernetes-sigs/service-catalog",
},
},
{
Expand Down Expand Up @@ -86,7 +86,7 @@ func TestCreateUpdateHandlerHandleCreateSuccess(t *testing.T) {
Operation: "add",
Path: "/metadata/finalizers",
Value: []interface{}{
"kubernetes-incubator/service-catalog",
"kubernetes-sigs/service-catalog",
},
},
},
Expand Down
4 changes: 2 additions & 2 deletions pkg/webhook/servicecatalog/clusterservicebroker/validation/handler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ package validation

import (
"context"
sc "github.com/kubernetes-incubator/service-catalog/pkg/apis/servicecatalog/v1beta1"
"github.com/kubernetes-incubator/service-catalog/pkg/webhookutil"
sc "github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/v1beta1"
"github.com/kubernetes-sigs/service-catalog/pkg/webhookutil"
admissionTypes "k8s.io/api/admission/v1beta1"
"net/http"
"sigs.k8s.io/controller-runtime/pkg/client"
Expand Down
6 changes: 3 additions & 3 deletions pkg/webhook/servicecatalog/clusterservicebroker/validation/handler_access.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ package validation
import (
"context"
"fmt"
sc "github.com/kubernetes-incubator/service-catalog/pkg/apis/servicecatalog/v1beta1"
"github.com/kubernetes-incubator/service-catalog/pkg/webhookutil"
sc "github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/v1beta1"
"github.com/kubernetes-sigs/service-catalog/pkg/webhookutil"
authenticationapi "k8s.io/api/authentication/v1"
authorizationapi "k8s.io/api/authorization/v1"
corev1 "k8s.io/api/core/v1"
Expand Down Expand Up @@ -52,7 +52,7 @@ func (h *AccessToBroker) InjectClient(c client.Client) error {
}

// Validate checks if client has access to cluster service broker if broker requires authentication
// This feature was copied from Service Catalog admission plugin https://github.com/kubernetes-incubator/service-catalog/blob/v0.1.41/plugin/pkg/admission/broker/authsarcheck/admission.go
// This feature was copied from Service Catalog admission plugin https://github.com/kubernetes-sigs/service-catalog/blob/v0.1.41/plugin/pkg/admission/broker/authsarcheck/admission.go
// If you want to track previous changes please check there.
func (h *AccessToBroker) Validate(ctx context.Context, req admission.Request, csb *sc.ClusterServiceBroker, traced *webhookutil.TracedLogger) *webhookutil.WebhookError {
if csb.Spec.AuthInfo == nil {
Expand Down
16 changes: 8 additions & 8 deletions pkg/webhook/servicecatalog/clusterservicebroker/validation/handler_access_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ package validation_test
import (
"context"
"errors"
sc "github.com/kubernetes-incubator/service-catalog/pkg/apis/servicecatalog/v1beta1"
"github.com/kubernetes-incubator/service-catalog/pkg/webhook/servicecatalog/clusterservicebroker/validation"
sc "github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/v1beta1"
"github.com/kubernetes-sigs/service-catalog/pkg/webhook/servicecatalog/clusterservicebroker/validation"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
admissionv1beta1 "k8s.io/api/admission/v1beta1"
Expand Down Expand Up @@ -91,7 +91,7 @@ func TestSpecValidationHandlerAccessToBrokerAllowed(t *testing.T) {
"apiVersion": "servicecatalog.k8s.io/v1beta1",
"kind": "ClusterServiceBroker",
"metadata": {
"finalizers": ["kubernetes-incubator/service-catalog"],
"finalizers": ["kubernetes-sigs/service-catalog"],
"creationTimestamp": null,
"name": "test-broker"
},
Expand All @@ -106,7 +106,7 @@ func TestSpecValidationHandlerAccessToBrokerAllowed(t *testing.T) {
"apiVersion": "servicecatalog.k8s.io/v1beta1",
"kind": "ClusterServiceBroker",
"metadata": {
"finalizers": ["kubernetes-incubator/service-catalog"],
"finalizers": ["kubernetes-sigs/service-catalog"],
"creationTimestamp": null,
"name": "test-broker"
},
Expand All @@ -121,7 +121,7 @@ func TestSpecValidationHandlerAccessToBrokerAllowed(t *testing.T) {
"apiVersion": "servicecatalog.k8s.io/v1beta1",
"kind": "ClusterServiceBroker",
"metadata": {
"finalizers": ["kubernetes-incubator/service-catalog"],
"finalizers": ["kubernetes-sigs/service-catalog"],
"creationTimestamp": null,
"name": "test-broker"
},
Expand All @@ -144,7 +144,7 @@ func TestSpecValidationHandlerAccessToBrokerAllowed(t *testing.T) {
"apiVersion": "servicecatalog.k8s.io/v1beta1",
"kind": "ClusterServiceBroker",
"metadata": {
"finalizers": ["kubernetes-incubator/service-catalog"],
"finalizers": ["kubernetes-sigs/service-catalog"],
"creationTimestamp": null,
"name": "test-broker"
},
Expand Down Expand Up @@ -221,7 +221,7 @@ func TestSpecValidationHandlerAccessToBrokerDenied(t *testing.T) {
"apiVersion": "servicecatalog.k8s.io/v1beta1",
"kind": "ClusterServiceBroker",
"metadata": {
"finalizers": ["kubernetes-incubator/service-catalog"],
"finalizers": ["kubernetes-sigs/service-catalog"],
"creationTimestamp": null,
"name": "test-broker"
},
Expand All @@ -244,7 +244,7 @@ func TestSpecValidationHandlerAccessToBrokerDenied(t *testing.T) {
"apiVersion": "servicecatalog.k8s.io/v1beta1",
"kind": "ClusterServiceBroker",
"metadata": {
"finalizers": ["kubernetes-incubator/service-catalog"],
"finalizers": ["kubernetes-sigs/service-catalog"],
"creationTimestamp": null,
"name": "test-broker"
},
Expand Down
6 changes: 3 additions & 3 deletions pkg/webhook/servicecatalog/clusterservicebroker/validation/handler_status.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ limitations under the License.
package validation

import (
sc "github.com/kubernetes-incubator/service-catalog/pkg/apis/servicecatalog/v1beta1"
scv "github.com/kubernetes-incubator/service-catalog/pkg/apis/servicecatalog/validation"
"github.com/kubernetes-incubator/service-catalog/pkg/webhookutil"
sc "github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/v1beta1"
scv "github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/validation"
"github.com/kubernetes-sigs/service-catalog/pkg/webhookutil"
admissionTypes "k8s.io/api/admission/v1beta1"

"context"
Expand Down
4 changes: 2 additions & 2 deletions pkg/webhook/servicecatalog/clusterservicebroker/validation/handler_status_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ package validation_test

import (
"context"
sc "github.com/kubernetes-incubator/service-catalog/pkg/apis/servicecatalog/v1beta1"
"github.com/kubernetes-incubator/service-catalog/pkg/webhook/servicecatalog/clusterservicebroker/validation"
sc "github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/v1beta1"
"github.com/kubernetes-sigs/service-catalog/pkg/webhook/servicecatalog/clusterservicebroker/validation"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
admissionv1beta1 "k8s.io/api/admission/v1beta1"
Expand Down
4 changes: 2 additions & 2 deletions pkg/webhook/servicecatalog/clusterservicebroker/validation/handler_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ package validation_test
import (
"testing"

"github.com/kubernetes-incubator/service-catalog/pkg/webhook/servicecatalog/clusterservicebroker/validation"
"github.com/kubernetes-incubator/service-catalog/pkg/webhookutil/tester"
"github.com/kubernetes-sigs/service-catalog/pkg/webhook/servicecatalog/clusterservicebroker/validation"
"github.com/kubernetes-sigs/service-catalog/pkg/webhookutil/tester"
)

func TestSpecValidationHandlerDecoderErrors(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions pkg/webhook/servicecatalog/clusterservicebroker/validation/static.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ package validation
import (
"context"

"github.com/kubernetes-incubator/service-catalog/pkg/webhookutil"
"github.com/kubernetes-sigs/service-catalog/pkg/webhookutil"
"sigs.k8s.io/controller-runtime/pkg/webhook/admission"

sc "github.com/kubernetes-incubator/service-catalog/pkg/apis/servicecatalog/v1beta1"
scv "github.com/kubernetes-incubator/service-catalog/pkg/apis/servicecatalog/validation"
sc "github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/v1beta1"
scv "github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/validation"
"net/http"
)

Expand Down
4 changes: 2 additions & 2 deletions pkg/webhook/servicecatalog/clusterserviceclass/mutation/handler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"encoding/json"
"net/http"

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

admissionTypes "k8s.io/api/admission/v1beta1"
"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
Expand Down
6 changes: 3 additions & 3 deletions pkg/webhook/servicecatalog/clusterserviceclass/mutation/handler_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import (
"testing"

"github.com/appscode/jsonpatch"
sc "github.com/kubernetes-incubator/service-catalog/pkg/apis/servicecatalog/v1beta1"
"github.com/kubernetes-incubator/service-catalog/pkg/webhook/servicecatalog/clusterserviceclass/mutation"
"github.com/kubernetes-incubator/service-catalog/pkg/webhookutil/tester"
sc "github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/v1beta1"
"github.com/kubernetes-sigs/service-catalog/pkg/webhook/servicecatalog/clusterserviceclass/mutation"
"github.com/kubernetes-sigs/service-catalog/pkg/webhookutil/tester"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
admissionv1beta1 "k8s.io/api/admission/v1beta1"
Expand Down
Loading

0 comments on commit 797a63a

Please sign in to comment.