From 30231c8fc57f0f687b8bca39f5c4e875fd1a3cbe Mon Sep 17 00:00:00 2001 From: hasbro17 Date: Fri, 27 Apr 2018 13:08:19 -0700 Subject: [PATCH] *: update import paths from coreos to operator-framework --- CONTRIBUTING.MD | 2 +- README.md | 4 ++-- bill-of-materials.json | 2 +- commands/operator-sdk/cmd/build.go | 4 ++-- commands/operator-sdk/cmd/generate.go | 2 +- commands/operator-sdk/cmd/generate/alm_catalog.go | 4 ++-- commands/operator-sdk/cmd/generate/k8s.go | 2 +- commands/operator-sdk/cmd/new.go | 6 +++--- commands/operator-sdk/main.go | 2 +- doc/design/long-term/testing-operators.md | 2 +- doc/dev/developer_guide.md | 6 +++--- doc/dev/reporting_bugs.md | 2 +- doc/user-guide.md | 4 ++-- example/memcached-operator/handler.go.tmpl | 8 ++++---- pkg/generator/api_tmpls.go | 2 +- pkg/generator/gen_main.go | 4 ++-- pkg/generator/generator_test.go | 12 ++++++------ pkg/generator/gopkg_tmpls.go | 2 +- pkg/sdk/action/action.go | 6 +++--- pkg/sdk/api.go | 6 +++--- pkg/sdk/handler/handler.go | 2 +- pkg/sdk/informer/sync.go | 6 +++--- pkg/sdk/query/query.go | 6 +++--- pkg/util/k8sutil/k8sutil.go | 2 +- 24 files changed, 49 insertions(+), 49 deletions(-) diff --git a/CONTRIBUTING.MD b/CONTRIBUTING.MD index 421c3ebd364..5b773c2becf 100644 --- a/CONTRIBUTING.MD +++ b/CONTRIBUTING.MD @@ -23,7 +23,7 @@ This is a rough outline of what a contributor's workflow looks like: - Make commits of logical units. - Make sure commit messages are in the proper format (see below). - Push changes in a topic branch to a personal fork of the repository. -- Submit a pull request to coreos/operator-sdk. +- Submit a pull request to operator-framework/operator-sdk. - The PR must receive a LGTM from two maintainers found in the MAINTAINERS file. Thanks for contributing! diff --git a/README.md b/README.md index fe534f5218b..8a89cef5cec 100644 --- a/README.md +++ b/README.md @@ -31,10 +31,10 @@ At a high level an operator using the SDK processes events for watched resources First, checkout and install the operator-sdk CLI: ```sh -$ cd $GOPATH/src/github.com/coreos/operator-sdk +$ cd $GOPATH/src/github.com/operator-framework/operator-sdk $ git checkout tags/v0.0.4 $ dep ensure -$ go install github.com/coreos/operator-sdk/commands/operator-sdk +$ go install github.com/operator-framework/operator-sdk/commands/operator-sdk ``` Create and deploy an app-operator using the SDK CLI: diff --git a/bill-of-materials.json b/bill-of-materials.json index 1c9bd35e4cc..0332bba087a 100644 --- a/bill-of-materials.json +++ b/bill-of-materials.json @@ -18,7 +18,7 @@ ] }, { - "project": "github.com/coreos/operator-sdk", + "project": "github.com/operator-framework/operator-sdk", "licenses": [ { "type": "Apache License 2.0", diff --git a/commands/operator-sdk/cmd/build.go b/commands/operator-sdk/cmd/build.go index fc32353d244..69364c5fbdc 100644 --- a/commands/operator-sdk/cmd/build.go +++ b/commands/operator-sdk/cmd/build.go @@ -20,8 +20,8 @@ import ( "os" "os/exec" - cmdError "github.com/coreos/operator-sdk/commands/operator-sdk/error" - "github.com/coreos/operator-sdk/pkg/generator" + cmdError "github.com/operator-framework/operator-sdk/commands/operator-sdk/error" + "github.com/operator-framework/operator-sdk/pkg/generator" "github.com/spf13/cobra" yaml "gopkg.in/yaml.v2" diff --git a/commands/operator-sdk/cmd/generate.go b/commands/operator-sdk/cmd/generate.go index d0742251935..3a4d3543461 100644 --- a/commands/operator-sdk/cmd/generate.go +++ b/commands/operator-sdk/cmd/generate.go @@ -15,7 +15,7 @@ package cmd import ( - "github.com/coreos/operator-sdk/commands/operator-sdk/cmd/generate" + "github.com/operator-framework/operator-sdk/commands/operator-sdk/cmd/generate" "github.com/spf13/cobra" ) diff --git a/commands/operator-sdk/cmd/generate/alm_catalog.go b/commands/operator-sdk/cmd/generate/alm_catalog.go index f6dfb39b86f..9067acc24ad 100644 --- a/commands/operator-sdk/cmd/generate/alm_catalog.go +++ b/commands/operator-sdk/cmd/generate/alm_catalog.go @@ -20,8 +20,8 @@ import ( "io/ioutil" "os" - cmdError "github.com/coreos/operator-sdk/commands/operator-sdk/error" - "github.com/coreos/operator-sdk/pkg/generator" + cmdError "github.com/operator-framework/operator-sdk/commands/operator-sdk/error" + "github.com/operator-framework/operator-sdk/pkg/generator" yaml "gopkg.in/yaml.v2" "github.com/spf13/cobra" diff --git a/commands/operator-sdk/cmd/generate/k8s.go b/commands/operator-sdk/cmd/generate/k8s.go index 503d600b583..9933e5c5927 100644 --- a/commands/operator-sdk/cmd/generate/k8s.go +++ b/commands/operator-sdk/cmd/generate/k8s.go @@ -20,7 +20,7 @@ import ( "os" "os/exec" - cmdError "github.com/coreos/operator-sdk/commands/operator-sdk/error" + cmdError "github.com/operator-framework/operator-sdk/commands/operator-sdk/error" "github.com/spf13/cobra" ) diff --git a/commands/operator-sdk/cmd/new.go b/commands/operator-sdk/cmd/new.go index 0e601c5aaee..4b318b61b4d 100644 --- a/commands/operator-sdk/cmd/new.go +++ b/commands/operator-sdk/cmd/new.go @@ -22,9 +22,9 @@ import ( "path/filepath" "strings" - "github.com/coreos/operator-sdk/commands/operator-sdk/cmd/generate" - cmdError "github.com/coreos/operator-sdk/commands/operator-sdk/error" - "github.com/coreos/operator-sdk/pkg/generator" + "github.com/operator-framework/operator-sdk/commands/operator-sdk/cmd/generate" + cmdError "github.com/operator-framework/operator-sdk/commands/operator-sdk/error" + "github.com/operator-framework/operator-sdk/pkg/generator" "github.com/spf13/cobra" ) diff --git a/commands/operator-sdk/main.go b/commands/operator-sdk/main.go index 22be5feddf3..0c282e01479 100644 --- a/commands/operator-sdk/main.go +++ b/commands/operator-sdk/main.go @@ -18,7 +18,7 @@ import ( "fmt" "os" - "github.com/coreos/operator-sdk/commands/operator-sdk/cmd" + "github.com/operator-framework/operator-sdk/commands/operator-sdk/cmd" ) func main() { diff --git a/doc/design/long-term/testing-operators.md b/doc/design/long-term/testing-operators.md index 9900097897c..b70ad6d3fa1 100644 --- a/doc/design/long-term/testing-operators.md +++ b/doc/design/long-term/testing-operators.md @@ -13,7 +13,7 @@ Make functional tests easy to integrate into a big matrix (upstream, OpenShift, - SDK provides a method to generate a functional testing container - Docs for using a test container and setting it up against a number of providers for use in a partners CI environment - Provide a way to run the Operator binary locally outside of a container - - Eg. https://github.com/coreos/operator-sdk/issues/142 + - Eg. https://github.com/operator-framework/operator-sdk/issues/142 **Open questions:** - none so far diff --git a/doc/dev/developer_guide.md b/doc/dev/developer_guide.md index 3a3aec54552..6ebd842ee6e 100644 --- a/doc/dev/developer_guide.md +++ b/doc/dev/developer_guide.md @@ -4,7 +4,7 @@ This document explains how to setup your dev environment. ## Download Operator SDK -Go to https://github.com/coreos/operator-sdk and follow the [fork guide][fork_guide] to fork, clone, and setup the local operator-sdk repository. +Go to https://github.com/operator-framework/operator-sdk and follow the [fork guide][fork_guide] to fork, clone, and setup the local operator-sdk repository. ## Vendor dependencies @@ -12,7 +12,7 @@ We use [dep](https://github.com/golang/dep) to manage dependencies. Run the following in the project root directory to update the vendored dependencies: ```sh -$ cd $GOPATH/src/github.com/coreos/operator-sdk +$ cd $GOPATH/src/github.com/operator-framework/operator-sdk $ dep ensure ``` @@ -25,7 +25,7 @@ Build the Operator SDK CLI `operator-sdk` binary: ```sh # TODO: replace this with the ./build script. -$ go install github.com/coreos/operator-sdk/commands/operator-sdk +$ go install github.com/operator-framework/operator-sdk/commands/operator-sdk ``` ## Testing diff --git a/doc/dev/reporting_bugs.md b/doc/dev/reporting_bugs.md index c8064765a44..36af804e73c 100644 --- a/doc/dev/reporting_bugs.md +++ b/doc/dev/reporting_bugs.md @@ -18,5 +18,5 @@ It may be worthwhile to read [Elika Etemad’s article on filing good bug report We might ask for further information to locate a bug. A duplicated bug report will be closed. -[operator-sdk-issue]: https://github.com/coreos/operator-sdk/issues/new +[operator-sdk-issue]: https://github.com/operator-framework/operator-sdk/issues/new [filing-good-bugs]: http://fantasai.inkedblade.net/style/talks/filing-good-bugs/ \ No newline at end of file diff --git a/doc/user-guide.md b/doc/user-guide.md index c54c9d8cbec..2cf7c1a6da5 100644 --- a/doc/user-guide.md +++ b/doc/user-guide.md @@ -19,10 +19,10 @@ The Operator SDK has a CLI tool that helps the developer to create, build, and d Checkout the desired release tag and install the SDK CLI tool: ```sh -$ cd $GOPATH/src/github.com/coreos/operator-sdk +$ cd $GOPATH/src/github.com/operator-framework/operator-sdk $ git checkout tags/v0.0.4 $ dep ensure -$ go install github.com/coreos/operator-sdk/commands/operator-sdk +$ go install github.com/operator-framework/operator-sdk/commands/operator-sdk ``` This installs the CLI binary `operator-sdk` at `$GOPATH/bin`. diff --git a/example/memcached-operator/handler.go.tmpl b/example/memcached-operator/handler.go.tmpl index 8730a2dc43c..2b6344e4cfc 100644 --- a/example/memcached-operator/handler.go.tmpl +++ b/example/memcached-operator/handler.go.tmpl @@ -6,10 +6,10 @@ import ( v1alpha1 "github.com/example-inc/memcached-operator/pkg/apis/cache/v1alpha1" - "github.com/coreos/operator-sdk/pkg/sdk/action" - "github.com/coreos/operator-sdk/pkg/sdk/handler" - "github.com/coreos/operator-sdk/pkg/sdk/query" - "github.com/coreos/operator-sdk/pkg/sdk/types" + "github.com/operator-framework/operator-sdk/pkg/sdk/action" + "github.com/operator-framework/operator-sdk/pkg/sdk/handler" + "github.com/operator-framework/operator-sdk/pkg/sdk/query" + "github.com/operator-framework/operator-sdk/pkg/sdk/types" appsv1 "k8s.io/api/apps/v1" "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/pkg/generator/api_tmpls.go b/pkg/generator/api_tmpls.go index f57168c78f3..c5c0018a8ae 100644 --- a/pkg/generator/api_tmpls.go +++ b/pkg/generator/api_tmpls.go @@ -24,7 +24,7 @@ package {{.Version}} const apiRegisterTmpl = `package {{.Version}} import ( - sdkK8sutil "github.com/coreos/operator-sdk/pkg/util/k8sutil" + sdkK8sutil "github.com/operator-framework/operator-sdk/pkg/util/k8sutil" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/pkg/generator/gen_main.go b/pkg/generator/gen_main.go index 8cd40f7d9c4..07cada74580 100644 --- a/pkg/generator/gen_main.go +++ b/pkg/generator/gen_main.go @@ -22,8 +22,8 @@ import ( const ( // sdkImport is the operator-sdk import path. - sdkImport = "github.com/coreos/operator-sdk/pkg/sdk" - versionImport = "github.com/coreos/operator-sdk/version" + sdkImport = "github.com/operator-framework/operator-sdk/pkg/sdk" + versionImport = "github.com/operator-framework/operator-sdk/version" ) // Main contains all the customized data needed to generate cmd//main.go for a new operator diff --git a/pkg/generator/generator_test.go b/pkg/generator/generator_test.go index 0504f102f80..843cb026a08 100644 --- a/pkg/generator/generator_test.go +++ b/pkg/generator/generator_test.go @@ -37,8 +37,8 @@ import ( "runtime" stub "github.com/example-inc/app-operator/pkg/stub" - sdk "github.com/coreos/operator-sdk/pkg/sdk" - sdkVersion "github.com/coreos/operator-sdk/version" + sdk "github.com/operator-framework/operator-sdk/pkg/sdk" + sdkVersion "github.com/operator-framework/operator-sdk/version" "github.com/sirupsen/logrus" ) @@ -74,9 +74,9 @@ const handlerExp = `package stub import ( "github.com/example-inc/app-operator/pkg/apis/app/v1alpha1" - "github.com/coreos/operator-sdk/pkg/sdk/action" - "github.com/coreos/operator-sdk/pkg/sdk/handler" - "github.com/coreos/operator-sdk/pkg/sdk/types" + "github.com/operator-framework/operator-sdk/pkg/sdk/action" + "github.com/operator-framework/operator-sdk/pkg/sdk/handler" + "github.com/operator-framework/operator-sdk/pkg/sdk/types" "github.com/sirupsen/logrus" "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" @@ -153,7 +153,7 @@ func TestGenHandler(t *testing.T) { const registerExp = `package v1alpha1 import ( - sdkK8sutil "github.com/coreos/operator-sdk/pkg/util/k8sutil" + sdkK8sutil "github.com/operator-framework/operator-sdk/pkg/util/k8sutil" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/pkg/generator/gopkg_tmpls.go b/pkg/generator/gopkg_tmpls.go index 0095aa468c0..d08e0c7593c 100644 --- a/pkg/generator/gopkg_tmpls.go +++ b/pkg/generator/gopkg_tmpls.go @@ -162,7 +162,7 @@ const gopkgTomlTmpl = `[[override]] version = "kubernetes-1.9.3" [[constraint]] - name = "github.com/coreos/operator-sdk" + name = "github.com/operator-framework/operator-sdk" # The version rule is used for a specific release and the master branch for in between releases. branch = "master" # version = "=v0.0.4" diff --git a/pkg/sdk/action/action.go b/pkg/sdk/action/action.go index 811e0a75d07..0d9fc6045dd 100644 --- a/pkg/sdk/action/action.go +++ b/pkg/sdk/action/action.go @@ -17,9 +17,9 @@ package action import ( "fmt" - "github.com/coreos/operator-sdk/pkg/k8sclient" - sdkTypes "github.com/coreos/operator-sdk/pkg/sdk/types" - "github.com/coreos/operator-sdk/pkg/util/k8sutil" + "github.com/operator-framework/operator-sdk/pkg/k8sclient" + sdkTypes "github.com/operator-framework/operator-sdk/pkg/sdk/types" + "github.com/operator-framework/operator-sdk/pkg/util/k8sutil" ) // Create creates the provided object on the server and updates the arg diff --git a/pkg/sdk/api.go b/pkg/sdk/api.go index 782b3c23a62..9d074eda89a 100644 --- a/pkg/sdk/api.go +++ b/pkg/sdk/api.go @@ -17,9 +17,9 @@ package sdk import ( "context" - "github.com/coreos/operator-sdk/pkg/k8sclient" - sdkHandler "github.com/coreos/operator-sdk/pkg/sdk/handler" - sdkInformer "github.com/coreos/operator-sdk/pkg/sdk/informer" + "github.com/operator-framework/operator-sdk/pkg/k8sclient" + sdkHandler "github.com/operator-framework/operator-sdk/pkg/sdk/handler" + sdkInformer "github.com/operator-framework/operator-sdk/pkg/sdk/informer" "github.com/sirupsen/logrus" ) diff --git a/pkg/sdk/handler/handler.go b/pkg/sdk/handler/handler.go index dabb6dda3cb..6bfe86cb84e 100644 --- a/pkg/sdk/handler/handler.go +++ b/pkg/sdk/handler/handler.go @@ -15,7 +15,7 @@ package handler import ( - sdkTypes "github.com/coreos/operator-sdk/pkg/sdk/types" + sdkTypes "github.com/operator-framework/operator-sdk/pkg/sdk/types" ) // Handler reacts to events and outputs actions. diff --git a/pkg/sdk/informer/sync.go b/pkg/sdk/informer/sync.go index b82e4c17e35..d37873e0163 100644 --- a/pkg/sdk/informer/sync.go +++ b/pkg/sdk/informer/sync.go @@ -15,9 +15,9 @@ package informer import ( - sdkHandler "github.com/coreos/operator-sdk/pkg/sdk/handler" - sdkTypes "github.com/coreos/operator-sdk/pkg/sdk/types" - "github.com/coreos/operator-sdk/pkg/util/k8sutil" + sdkHandler "github.com/operator-framework/operator-sdk/pkg/sdk/handler" + sdkTypes "github.com/operator-framework/operator-sdk/pkg/sdk/types" + "github.com/operator-framework/operator-sdk/pkg/util/k8sutil" "github.com/sirupsen/logrus" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" diff --git a/pkg/sdk/query/query.go b/pkg/sdk/query/query.go index 55903cfc5cc..47b03889ed9 100644 --- a/pkg/sdk/query/query.go +++ b/pkg/sdk/query/query.go @@ -17,9 +17,9 @@ package query import ( "fmt" - "github.com/coreos/operator-sdk/pkg/k8sclient" - sdkTypes "github.com/coreos/operator-sdk/pkg/sdk/types" - "github.com/coreos/operator-sdk/pkg/util/k8sutil" + "github.com/operator-framework/operator-sdk/pkg/k8sclient" + sdkTypes "github.com/operator-framework/operator-sdk/pkg/sdk/types" + "github.com/operator-framework/operator-sdk/pkg/util/k8sutil" ) // Get gets the specified object and unmarshals the retrieved data into the "into" object. diff --git a/pkg/util/k8sutil/k8sutil.go b/pkg/util/k8sutil/k8sutil.go index b7d630fbd85..243adfaf0dd 100644 --- a/pkg/util/k8sutil/k8sutil.go +++ b/pkg/util/k8sutil/k8sutil.go @@ -85,7 +85,7 @@ func UnstructuredFromRuntimeObject(ro runtime.Object) *unstructured.Unstructured } // UnstructuredIntoRuntimeObject unmarshalls an unstructured into a given runtime object -// TODO: https://github.com/coreos/operator-sdk/issues/127 +// TODO: https://github.com/operator-framework/operator-sdk/issues/127 func UnstructuredIntoRuntimeObject(u *unstructured.Unstructured, into runtime.Object) error { gvk := u.GroupVersionKind() decoder := decoder(gvk.GroupVersion())