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
Browse files Browse the repository at this point in the history
  • Loading branch information
jberkhahn committed Jun 4, 2019
1 parent 6c6a49d commit 086eb18
Show file tree
Hide file tree
Showing 404 changed files with 1,154 additions and 1,154 deletions.
8 changes: 4 additions & 4 deletions Makefile
Expand Up @@ -26,7 +26,7 @@ ROOT = $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
BINDIR ?= bin
BUILD_DIR ?= build
COVERAGE ?= $(CURDIR)/coverage.html
SC_PKG = github.com/kubernetes-incubator/service-catalog
SC_PKG = github.com/kubernetes-sigs/service-catalog
TOP_SRC_DIRS = cmd contrib pkg plugin
SRC_DIRS = $(shell sh -c "find $(TOP_SRC_DIRS) -name \\*.go \
-exec dirname {} \\; | sort | uniq")
Expand Down Expand Up @@ -80,7 +80,7 @@ GO_BUILD = env CGO_ENABLED=0 GOOS=$(PLATFORM) GOARCH=$(ARCH) \
go build $(GOFLAGS) -a -tags netgo -installsuffix netgo \
-ldflags '-s -w -X $(SC_PKG)/pkg.VERSION=$(VERSION) $(BUILD_LDFLAGS)'

BASE_PATH = $(ROOT:/src/github.com/kubernetes-incubator/service-catalog/=)
BASE_PATH = $(ROOT:/src/github.com/kubernetes-sigs/service-catalog/=)
ORIG_GOPATH ?= $(shell go env GOPATH)
export GOPATH = $(BASE_PATH):$(ROOT)/vendor

Expand Down Expand Up @@ -238,7 +238,7 @@ verify: .init verify-generated verify-client-gen verify-docs verify-vendor
@echo Running tag verification:
@$(DOCKER_CMD) build/verify-tags.sh
@echo Validating golden file flag is defined:
@$(DOCKER_CMD) go test -run DRYRUN ./cmd/svcat/... -update || printf "\n\nmake test-update-goldenfiles is broken. For each failed package above, add the following empty import to one of the test files to define the -update flag:\n_ \"github.com/kubernetes-incubator/service-catalog/internal/test\""
@$(DOCKER_CMD) go test -run DRYRUN ./cmd/svcat/... -update || printf "\n\nmake test-update-goldenfiles is broken. For each failed package above, add the following empty import to one of the test files to define the -update flag:\n_ \"github.com/kubernetes-sigs/service-catalog/internal/test\""

verify-docs: .init
@echo Running href checker$(SKIP_COMMENT):
Expand Down Expand Up @@ -283,7 +283,7 @@ test-update-goldenfiles: .init
$(DOCKER_CMD) go test ./cmd/svcat/... -update

build-integration: .generate_files
$(DOCKER_CMD) go test -race github.com/kubernetes-incubator/service-catalog/test/integration/... -c
$(DOCKER_CMD) go test -race github.com/kubernetes-sigs/service-catalog/test/integration/... -c

test-integration: .init $(scBuildImageTarget) build build-integration
# test kubectl
Expand Down
4 changes: 2 additions & 2 deletions build/build-image/Dockerfile
Expand Up @@ -37,7 +37,7 @@ RUN curl -sLo /usr/local/bin/az https://github.com/carolynvs/az-cli/releases/dow
chmod +x /usr/local/bin/az

# Create the full dir tree that we'll mount our src into when we run the image
RUN mkdir -p /go/src/github.com/kubernetes-incubator/service-catalog
RUN mkdir -p /go/src/github.com/kubernetes-sigs/service-catalog

# Default to our src dir
WORKDIR /go/src/github.com/kubernetes-incubator/service-catalog
WORKDIR /go/src/github.com/kubernetes-sigs/service-catalog
6 changes: 3 additions & 3 deletions build/update-apiserver-gen.sh
Expand Up @@ -23,7 +23,7 @@ set -o xtrace

REPO_ROOT=$(realpath $(dirname "${BASH_SOURCE}")/..)
BINDIR=${REPO_ROOT}/bin
SC_PKG='github.com/kubernetes-incubator/service-catalog'
SC_PKG='github.com/kubernetes-sigs/service-catalog'

# Generate defaults
${BINDIR}/defaulter-gen "$@" \
Expand All @@ -40,7 +40,7 @@ ${BINDIR}/deepcopy-gen "$@" \
--go-header-file "vendor/github.com/kubernetes/repo-infra/verify/boilerplate/boilerplate.go.txt" \
--input-dirs "${SC_PKG}/pkg/apis/servicecatalog" \
--input-dirs "${SC_PKG}/pkg/apis/servicecatalog/v1beta1" \
--bounding-dirs "github.com/kubernetes-incubator/service-catalog" \
--bounding-dirs "github.com/kubernetes-sigs/service-catalog" \
--output-file-base zz_generated.deepcopy
# Generate conversions
${BINDIR}/conversion-gen "$@" \
Expand Down Expand Up @@ -70,7 +70,7 @@ ${BINDIR}/deepcopy-gen "$@" \
--go-header-file "vendor/github.com/kubernetes/repo-infra/verify/boilerplate/boilerplate.go.txt" \
--input-dirs "${SC_PKG}/pkg/apis/settings" \
--input-dirs "${SC_PKG}/pkg/apis/settings/v1alpha1" \
--bounding-dirs "github.com/kubernetes-incubator/service-catalog" \
--bounding-dirs "github.com/kubernetes-sigs/service-catalog" \
--output-file-base zz_generated.deepcopy
# Generate conversions
${BINDIR}/conversion-gen "$@" \
Expand Down
34 changes: 17 additions & 17 deletions build/update-client-gen.sh
Expand Up @@ -30,36 +30,36 @@ BINDIR=${REPO_ROOT}/bin

# Generate the internal clientset (pkg/client/clientset_generated/internalclientset)
${BINDIR}/client-gen "$@" \
--input-base "github.com/kubernetes-incubator/service-catalog/pkg/apis/" \
--input-base "github.com/kubernetes-sigs/service-catalog/pkg/apis/" \
--input servicecatalog/ \
--input settings/ \
--clientset-path "github.com/kubernetes-incubator/service-catalog/pkg/client/clientset_generated/" \
--clientset-path "github.com/kubernetes-sigs/service-catalog/pkg/client/clientset_generated/" \
--clientset-name internalclientset \
--go-header-file "vendor/github.com/kubernetes/repo-infra/verify/boilerplate/boilerplate.go.txt"
# Generate the versioned clientset (pkg/client/clientset_generated/clientset)
${BINDIR}/client-gen "$@" \
--input-base "github.com/kubernetes-incubator/service-catalog/pkg/apis/" \
--input-base "github.com/kubernetes-sigs/service-catalog/pkg/apis/" \
--input "servicecatalog/v1beta1" \
--input "settings/v1alpha1" \
--clientset-path "github.com/kubernetes-incubator/service-catalog/pkg/client/clientset_generated/" \
--clientset-path "github.com/kubernetes-sigs/service-catalog/pkg/client/clientset_generated/" \
--clientset-name "clientset" \
--go-header-file "vendor/github.com/kubernetes/repo-infra/verify/boilerplate/boilerplate.go.txt"
# generate listers after having the base client generated, and before informers
${BINDIR}/lister-gen "$@" \
--input-dirs="github.com/kubernetes-incubator/service-catalog/pkg/apis/servicecatalog" \
--input-dirs="github.com/kubernetes-incubator/service-catalog/pkg/apis/servicecatalog/v1beta1" \
--input-dirs="github.com/kubernetes-incubator/service-catalog/pkg/apis/settings" \
--input-dirs="github.com/kubernetes-incubator/service-catalog/pkg/apis/settings/v1alpha1" \
--output-package "github.com/kubernetes-incubator/service-catalog/pkg/client/listers_generated" \
--input-dirs="github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog" \
--input-dirs="github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/v1beta1" \
--input-dirs="github.com/kubernetes-sigs/service-catalog/pkg/apis/settings" \
--input-dirs="github.com/kubernetes-sigs/service-catalog/pkg/apis/settings/v1alpha1" \
--output-package "github.com/kubernetes-sigs/service-catalog/pkg/client/listers_generated" \
--go-header-file "vendor/github.com/kubernetes/repo-infra/verify/boilerplate/boilerplate.go.txt"
# generate informers after the listers have been generated
${BINDIR}/informer-gen "$@" \
--go-header-file "vendor/github.com/kubernetes/repo-infra/verify/boilerplate/boilerplate.go.txt" \
--input-dirs "github.com/kubernetes-incubator/service-catalog/pkg/apis/servicecatalog" \
--input-dirs "github.com/kubernetes-incubator/service-catalog/pkg/apis/servicecatalog/v1beta1" \
--input-dirs "github.com/kubernetes-incubator/service-catalog/pkg/apis/settings" \
--input-dirs "github.com/kubernetes-incubator/service-catalog/pkg/apis/settings/v1alpha1" \
--internal-clientset-package "github.com/kubernetes-incubator/service-catalog/pkg/client/clientset_generated/internalclientset" \
--versioned-clientset-package "github.com/kubernetes-incubator/service-catalog/pkg/client/clientset_generated/clientset" \
--listers-package "github.com/kubernetes-incubator/service-catalog/pkg/client/listers_generated" \
--output-package "github.com/kubernetes-incubator/service-catalog/pkg/client/informers_generated"
--input-dirs "github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog" \
--input-dirs "github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/v1beta1" \
--input-dirs "github.com/kubernetes-sigs/service-catalog/pkg/apis/settings" \
--input-dirs "github.com/kubernetes-sigs/service-catalog/pkg/apis/settings/v1alpha1" \
--internal-clientset-package "github.com/kubernetes-sigs/service-catalog/pkg/client/clientset_generated/internalclientset" \
--versioned-clientset-package "github.com/kubernetes-sigs/service-catalog/pkg/client/clientset_generated/clientset" \
--listers-package "github.com/kubernetes-sigs/service-catalog/pkg/client/listers_generated" \
--output-package "github.com/kubernetes-sigs/service-catalog/pkg/client/informers_generated"
2 changes: 1 addition & 1 deletion charts/catalog/README.md
Expand Up @@ -7,7 +7,7 @@ to provision and bind to application dependencies like databases, object
storage, message-oriented middleware, and more.

For more information,
[visit the project on github](https://github.com/kubernetes-incubator/service-catalog).
[visit the project on github](https://github.com/kubernetes-sigs/service-catalog).

## Prerequisites

Expand Down
2 changes: 1 addition & 1 deletion charts/healthcheck/README.md
Expand Up @@ -3,7 +3,7 @@
HealthCheck is a tool that can be used to monitor the basic health of the Service Catalog deployment. It utilizes the User Provided Service Broker to perform basic end to end tests such as creating a Service Instance and Binding and verifying the operations are successful and then tearing it down. It collects Prometheus metrics which can be scraped for analysis and alerting (ie error rate, execution time to create an instance or binding, etc).

For more information,
[visit the Service Catalog project on github](https://github.com/kubernetes-incubator/service-catalog).
[visit the Service Catalog project on github](https://github.com/kubernetes-sigs/service-catalog).

## Installing the Chart

Expand Down
2 changes: 1 addition & 1 deletion charts/test-broker/README.md
Expand Up @@ -6,7 +6,7 @@ for manually testing & demonstrating the Kubernetes
Service Catalog.

For more information,
[visit the Service Catalog project on github](https://github.com/kubernetes-incubator/service-catalog).
[visit the Service Catalog project on github](https://github.com/kubernetes-sigs/service-catalog).

## Installing the Chart

Expand Down
2 changes: 1 addition & 1 deletion charts/ups-broker/README.md
Expand Up @@ -6,7 +6,7 @@ for use demonstrating the Kubernetes
Service Catalog.

For more information,
[visit the Service Catalog project on github](https://github.com/kubernetes-incubator/service-catalog).
[visit the Service Catalog project on github](https://github.com/kubernetes-sigs/service-catalog).

## Installing the Chart

Expand Down
8 changes: 4 additions & 4 deletions cmd/apiserver/app/server/plugins.go
Expand Up @@ -23,10 +23,10 @@ import (
"k8s.io/apiserver/pkg/admission"

// Admission controllers
"github.com/kubernetes-incubator/service-catalog/plugin/pkg/admission/broker/authsarcheck"
siclifecycle "github.com/kubernetes-incubator/service-catalog/plugin/pkg/admission/servicebindings/lifecycle"
"github.com/kubernetes-incubator/service-catalog/plugin/pkg/admission/serviceplan/changevalidator"
"github.com/kubernetes-incubator/service-catalog/plugin/pkg/admission/serviceplan/defaultserviceplan"
"github.com/kubernetes-sigs/service-catalog/plugin/pkg/admission/broker/authsarcheck"
siclifecycle "github.com/kubernetes-sigs/service-catalog/plugin/pkg/admission/servicebindings/lifecycle"
"github.com/kubernetes-sigs/service-catalog/plugin/pkg/admission/serviceplan/changevalidator"
"github.com/kubernetes-sigs/service-catalog/plugin/pkg/admission/serviceplan/defaultserviceplan"
)

// registerAllAdmissionPlugins registers all admission plugins
Expand Down
6 changes: 3 additions & 3 deletions cmd/apiserver/app/server/run_server.go
Expand Up @@ -20,13 +20,13 @@ import (
"fmt"
"net/http"

"github.com/kubernetes-incubator/service-catalog/pkg/api"
"github.com/kubernetes-sigs/service-catalog/pkg/api"
"k8s.io/apiserver/pkg/server/healthz"
genericapiserverstorage "k8s.io/apiserver/pkg/server/storage"
"k8s.io/apiserver/pkg/storage/etcd3/preflight"

"github.com/kubernetes-incubator/service-catalog/pkg/apiserver"
"github.com/kubernetes-incubator/service-catalog/pkg/apiserver/options"
"github.com/kubernetes-sigs/service-catalog/pkg/apiserver"
"github.com/kubernetes-sigs/service-catalog/pkg/apiserver/options"
"k8s.io/klog"
)

Expand Down
20 changes: 10 additions & 10 deletions cmd/apiserver/app/server/util.go
Expand Up @@ -40,14 +40,14 @@ import (
kubeclientset "k8s.io/client-go/kubernetes"
restclient "k8s.io/client-go/rest"

"github.com/kubernetes-incubator/service-catalog/pkg/api"
scadmission "github.com/kubernetes-incubator/service-catalog/pkg/apiserver/admission"
"github.com/kubernetes-incubator/service-catalog/pkg/apiserver/authenticator"
"github.com/kubernetes-incubator/service-catalog/pkg/client/clientset_generated/internalclientset"
informers "github.com/kubernetes-incubator/service-catalog/pkg/client/informers_generated/internalversion"
"github.com/kubernetes-incubator/service-catalog/pkg/openapi"
"github.com/kubernetes-incubator/service-catalog/pkg/util/kube"
"github.com/kubernetes-incubator/service-catalog/pkg/version"
"github.com/kubernetes-sigs/service-catalog/pkg/api"
scadmission "github.com/kubernetes-sigs/service-catalog/pkg/apiserver/admission"
"github.com/kubernetes-sigs/service-catalog/pkg/apiserver/authenticator"
"github.com/kubernetes-sigs/service-catalog/pkg/client/clientset_generated/internalclientset"
informers "github.com/kubernetes-sigs/service-catalog/pkg/client/informers_generated/internalversion"
"github.com/kubernetes-sigs/service-catalog/pkg/openapi"
"github.com/kubernetes-sigs/service-catalog/pkg/util/kube"
"github.com/kubernetes-sigs/service-catalog/pkg/version"
)

const (
Expand Down Expand Up @@ -128,10 +128,10 @@ func buildGenericConfig(s *ServiceCatalogServerOptions) (*genericapiserver.Recom
}

// TODO: investigate if we need metrics unique to service catalog, but take defaults for now
// see https://github.com/kubernetes-incubator/service-catalog/issues/677
// see https://github.com/kubernetes-sigs/service-catalog/issues/677
genericConfig.EnableMetrics = true
// TODO: add support to default these values in build
// see https://github.com/kubernetes-incubator/service-catalog/issues/722
// see https://github.com/kubernetes-sigs/service-catalog/issues/722
serviceCatalogVersion := version.Get()
genericConfig.Version = &serviceCatalogVersion

Expand Down
18 changes: 9 additions & 9 deletions cmd/controller-manager/app/controller_manager.go
Expand Up @@ -38,10 +38,10 @@ import (
"k8s.io/client-go/tools/clientcmd"
"k8s.io/client-go/tools/record"

"github.com/kubernetes-incubator/service-catalog/pkg/client/clientset_generated/clientset"
"github.com/kubernetes-incubator/service-catalog/pkg/kubernetes/pkg/util/configz"
"github.com/kubernetes-incubator/service-catalog/pkg/metrics"
"github.com/kubernetes-incubator/service-catalog/pkg/metrics/osbclientproxy"
"github.com/kubernetes-sigs/service-catalog/pkg/client/clientset_generated/clientset"
"github.com/kubernetes-sigs/service-catalog/pkg/kubernetes/pkg/util/configz"
"github.com/kubernetes-sigs/service-catalog/pkg/metrics"
"github.com/kubernetes-sigs/service-catalog/pkg/metrics/osbclientproxy"

"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
Expand All @@ -50,11 +50,11 @@ import (
"k8s.io/client-go/tools/leaderelection"
"k8s.io/client-go/tools/leaderelection/resourcelock"

"github.com/kubernetes-incubator/service-catalog/cmd/controller-manager/app/options"
servicecatalogv1beta1 "github.com/kubernetes-incubator/service-catalog/pkg/apis/servicecatalog/v1beta1"
settingsv1alpha1 "github.com/kubernetes-incubator/service-catalog/pkg/apis/settings/v1alpha1"
servicecataloginformers "github.com/kubernetes-incubator/service-catalog/pkg/client/informers_generated/externalversions"
"github.com/kubernetes-incubator/service-catalog/pkg/controller"
"github.com/kubernetes-sigs/service-catalog/cmd/controller-manager/app/options"
servicecatalogv1beta1 "github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/v1beta1"
settingsv1alpha1 "github.com/kubernetes-sigs/service-catalog/pkg/apis/settings/v1alpha1"
servicecataloginformers "github.com/kubernetes-sigs/service-catalog/pkg/client/informers_generated/externalversions"
"github.com/kubernetes-sigs/service-catalog/pkg/controller"

"context"

Expand Down
8 changes: 4 additions & 4 deletions cmd/controller-manager/app/options/options.go
Expand Up @@ -26,10 +26,10 @@ import (
"github.com/spf13/pflag"
utilfeature "k8s.io/apiserver/pkg/util/feature"

"github.com/kubernetes-incubator/service-catalog/pkg/apis/componentconfig"
"github.com/kubernetes-incubator/service-catalog/pkg/controller"
k8scomponentconfig "github.com/kubernetes-incubator/service-catalog/pkg/kubernetes/pkg/apis/componentconfig"
"github.com/kubernetes-incubator/service-catalog/pkg/kubernetes/pkg/client/leaderelectionconfig"
"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
6 changes: 3 additions & 3 deletions cmd/healthcheck/framework/healthcheck.go
Expand Up @@ -24,9 +24,9 @@ import (
"strings"
"time"

v1beta1 "github.com/kubernetes-incubator/service-catalog/pkg/apis/servicecatalog/v1beta1"
"github.com/kubernetes-incubator/service-catalog/pkg/client/clientset_generated/clientset"
util "github.com/kubernetes-incubator/service-catalog/test/util"
v1beta1 "github.com/kubernetes-sigs/service-catalog/pkg/apis/servicecatalog/v1beta1"
"github.com/kubernetes-sigs/service-catalog/pkg/client/clientset_generated/clientset"
util "github.com/kubernetes-sigs/service-catalog/test/util"
"github.com/spf13/cobra"
pflag "github.com/spf13/pflag"
corev1 "k8s.io/api/core/v1"
Expand Down
2 changes: 1 addition & 1 deletion cmd/healthcheck/main.go
Expand Up @@ -19,7 +19,7 @@ package main
import (
"os"

"github.com/kubernetes-incubator/service-catalog/cmd/healthcheck/framework"
"github.com/kubernetes-sigs/service-catalog/cmd/healthcheck/framework"
"k8s.io/klog"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/service-catalog/main.go
Expand Up @@ -22,8 +22,8 @@ package main
import (
"os"

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

func main() {
Expand Down
4 changes: 2 additions & 2 deletions cmd/service-catalog/server/apiserver.go
Expand Up @@ -17,8 +17,8 @@ limitations under the License.
package server

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

// NewAPIServer creates a new hyperkube Server object that includes the
Expand Down
6 changes: 3 additions & 3 deletions cmd/service-catalog/server/controller-manager.go
Expand Up @@ -17,9 +17,9 @@ limitations under the License.
package server

import (
"github.com/kubernetes-incubator/service-catalog/cmd/controller-manager/app"
"github.com/kubernetes-incubator/service-catalog/cmd/controller-manager/app/options"
"github.com/kubernetes-incubator/service-catalog/pkg/hyperkube"
"github.com/kubernetes-sigs/service-catalog/cmd/controller-manager/app"
"github.com/kubernetes-sigs/service-catalog/cmd/controller-manager/app/options"
"github.com/kubernetes-sigs/service-catalog/pkg/hyperkube"
)

// NewControllerManager creates a new hyperkube Server object that includes the
Expand Down
6 changes: 3 additions & 3 deletions cmd/svcat/binding/bind_cmd.go
Expand Up @@ -19,9 +19,9 @@ package binding
import (
"fmt"

"github.com/kubernetes-incubator/service-catalog/cmd/svcat/command"
"github.com/kubernetes-incubator/service-catalog/cmd/svcat/output"
"github.com/kubernetes-incubator/service-catalog/cmd/svcat/parameters"
"github.com/kubernetes-sigs/service-catalog/cmd/svcat/command"
"github.com/kubernetes-sigs/service-catalog/cmd/svcat/output"
"github.com/kubernetes-sigs/service-catalog/cmd/svcat/parameters"
"github.com/spf13/cobra"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/svcat/binding/describe_cmd.go
Expand Up @@ -19,8 +19,8 @@ package binding
import (
"fmt"

"github.com/kubernetes-incubator/service-catalog/cmd/svcat/command"
"github.com/kubernetes-incubator/service-catalog/cmd/svcat/output"
"github.com/kubernetes-sigs/service-catalog/cmd/svcat/command"
"github.com/kubernetes-sigs/service-catalog/cmd/svcat/output"
"github.com/spf13/cobra"
)

Expand Down

0 comments on commit 086eb18

Please sign in to comment.