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 (#2652)
Browse files Browse the repository at this point in the history
  • Loading branch information
jberkhahn authored and k8s-ci-robot committed Jun 5, 2019
1 parent 6c6a49d commit 492c017
Show file tree
Hide file tree
Showing 408 changed files with 1,166 additions and 1,166 deletions.
4 changes: 2 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!-- Thanks for sending a pull request! Here are some tips for you:
1. If this is your first time, read our contributor guidelines https://github.com/kubernetes-incubator/service-catalog/blob/master/CONTRIBUTING.md
1. If this is your first time, read our contributor guidelines https://github.com/kubernetes-sigs/service-catalog/blob/master/CONTRIBUTING.md
2. If the PR is unfinished, see how to mark it: https://git.k8s.io/community/contributors/guide/pull-requests.md#marking-unfinished-pull-requests
3. See our merge process https://github.com/kubernetes-incubator/service-catalog/blob/master/REVIEWING.md
3. See our merge process https://github.com/kubernetes-sigs/service-catalog/blob/master/REVIEWING.md
-->

This PR is a
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
provider: script
script: contrib/travis/deploy.sh
on:
repo: kubernetes-incubator/service-catalog
repo: kubernetes-sigs/service-catalog
all_branches: true
- stage: push-chart
script:
Expand Down
8 changes: 4 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ to indicate issues that are ideal for new contributors.
Once you have found an issue that you'd like to work on, comment on it with
"#dibs", or "I would like to work on this". If someone else said that they would
like to work on it, but there's no open PR and it's been more than 2 weeks,
comment with "@kubernetes-incubator/maintainers-service-catalog Is it okay if I
comment with "@kubernetes-sigs/service-catalog-maintainers Is it okay if I
take this?" and a maintainer will help out.

## Submitting a Pull Request (PR)
Expand All @@ -40,7 +40,7 @@ be reviewed.
## Development status

We have finished the work for the v0.2 release.
We are currently working towards our [v0.3 milestone](https://github.com/kubernetes-incubator/service-catalog/milestone/51).
We are currently working towards our [v0.3 milestone](https://github.com/kubernetes-sigs/service-catalog/milestone/51).

## Methodology

Expand All @@ -56,5 +56,5 @@ project, adding or altering a file within the `docs` directory.
We'll update this space as we begin developing code with relevant dev
information.

[help-wanted]: https://github.com/kubernetes-incubator/service-catalog/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22
[good-first-issue]: https://github.com/kubernetes-incubator/service-catalog/issues?utf8=%E2%9C%93&q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22+
[help-wanted]: https://github.com/kubernetes-sigs/service-catalog/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22
[good-first-issue]: https://github.com/kubernetes-sigs/service-catalog/issues?utf8=%E2%9C%93&q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22+
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
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
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
## `service-catalog`

[![Build Status](https://travis-ci.org/kubernetes-incubator/service-catalog.svg?branch=master)](https://travis-ci.org/kubernetes-incubator/service-catalog "Travis")
[![Go Report Card](https://goreportcard.com/badge/github.com/kubernetes-incubator/service-catalog)](https://goreportcard.com/report/github.com/kubernetes-incubator/service-catalog)
[![Build Status](https://travis-ci.org/kubernetes-sigs/service-catalog.svg?branch=master)](https://travis-ci.org/kubernetes-sigs/service-catalog "Travis")
[![Go Report Card](https://goreportcard.com/badge/github.com/kubernetes-sigs/service-catalog)](https://goreportcard.com/report/github.com/kubernetes-sigs/service-catalog)

<p align="center">
<a href="https://svc-cat.io">
Expand Down Expand Up @@ -36,14 +36,14 @@ Open Service Broker API project's [Getting Started guide](https://github.com/ope

We are currently working toward a beta-quality release to be used in conjunction with
Kubernetes 1.9. See the
[milestones list](https://github.com/kubernetes-incubator/service-catalog/milestones?direction=desc&sort=due_date&state=open)
[milestones list](https://github.com/kubernetes-sigs/service-catalog/milestones?direction=desc&sort=due_date&state=open)
for information about the issues and PRs in current and future milestones.

The project [roadmap](https://github.com/kubernetes-incubator/service-catalog/wiki/Roadmap)
The project [roadmap](https://github.com/kubernetes-sigs/service-catalog/wiki/Roadmap)
contains information about our high-level goals for future milestones.

We are currently making weekly releases; see the
[release process](https://github.com/kubernetes-incubator/service-catalog/wiki/Release-Process)
[release process](https://github.com/kubernetes-sigs/service-catalog/wiki/Release-Process)
for more information.

### Terminology
Expand Down
4 changes: 2 additions & 2 deletions build/build-image/Dockerfile
Original file line number Diff line number Diff line change
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
Original file line number Diff line number Diff line change
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
Original file line number Diff line number Diff line change
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
Original file line number Diff line number Diff line change
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
Original file line number Diff line number Diff line change
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
Original file line number Diff line number Diff line change
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
Original file line number Diff line number Diff line change
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
Original file line number Diff line number Diff line change
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
Original file line number Diff line number Diff line change
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
Original file line number Diff line number Diff line change
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
Original file line number Diff line number Diff line change
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
Loading

0 comments on commit 492c017

Please sign in to comment.