Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion CONTRIBUTING.MD
Original file line number Diff line number Diff line change
Expand Up @@ -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!
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion bill-of-materials.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
]
},
{
"project": "github.com/coreos/operator-sdk",
"project": "github.com/operator-framework/operator-sdk",
"licenses": [
{
"type": "Apache License 2.0",
Expand Down
4 changes: 2 additions & 2 deletions commands/operator-sdk/cmd/build.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion commands/operator-sdk/cmd/generate.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
4 changes: 2 additions & 2 deletions commands/operator-sdk/cmd/generate/alm_catalog.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion commands/operator-sdk/cmd/generate/k8s.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
6 changes: 3 additions & 3 deletions commands/operator-sdk/cmd/new.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion commands/operator-sdk/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion doc/design/long-term/testing-operators.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions doc/dev/developer_guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ 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

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
```

Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion doc/dev/reporting_bugs.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/
4 changes: 2 additions & 2 deletions doc/user-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`.
Expand Down
8 changes: 4 additions & 4 deletions example/memcached-operator/handler.go.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/generator/api_tmpls.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions pkg/generator/gen_main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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/<projectName>/main.go for a new operator
Expand Down
12 changes: 6 additions & 6 deletions pkg/generator/generator_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/generator/gopkg_tmpls.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions pkg/sdk/action/action.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions pkg/sdk/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/sdk/handler/handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions pkg/sdk/informer/sync.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions pkg/sdk/query/query.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion pkg/util/k8sutil/k8sutil.go
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down