diff --git a/README.md b/README.md index 34ea39346..f08b62aa6 100644 --- a/README.md +++ b/README.md @@ -26,8 +26,8 @@ You won't be able to compile the operator with Go older than 1.7. We recommend i Go projects expect their source code and all the dependencies to be located under the [GOPATH](https://github.com/golang/go/wiki/GOPATH). Normally, one would create a directory for the GOPATH (i.e. ~/go) and place the source code under the ~/go/src subdirectories. -Given the schema above, the postgres operator source code located at `github.bus.zalan.do/acid/postgres-operator` should be put at -`~/go/src/github.bus.zalan.do/acid/postgres-operator`. +Given the schema above, the postgres operator source code located at `github.com/zalando-incubator/postgres-operator` should be put at +`~/go/src/github.com/zalando-incubator/postgres-operator`. $ export GOPATH=~/go $ mkdir -p ${GOPATH}/src/github.bus.zalan.do/acid/ diff --git a/cmd/main.go b/cmd/main.go index 7ea626bd0..d283c5a10 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -8,10 +8,10 @@ import ( "sync" "syscall" - "github.bus.zalan.do/acid/postgres-operator/pkg/controller" - "github.bus.zalan.do/acid/postgres-operator/pkg/spec" - "github.bus.zalan.do/acid/postgres-operator/pkg/util/config" - "github.bus.zalan.do/acid/postgres-operator/pkg/util/k8sutil" + "github.com/zalando-incubator/postgres-operator/pkg/controller" + "github.com/zalando-incubator/postgres-operator/pkg/spec" + "github.com/zalando-incubator/postgres-operator/pkg/util/config" + "github.com/zalando-incubator/postgres-operator/pkg/util/k8sutil" ) var ( diff --git a/glide.yaml b/glide.yaml index 5917095a5..26a70711c 100644 --- a/glide.yaml +++ b/glide.yaml @@ -1,4 +1,4 @@ -package: github.bus.zalan.do/acid/postgres-operator +package: github.com/zalando-incubator/postgres-operator import: - package: github.com/gogo/protobuf version: ^0.3.0 diff --git a/pkg/cluster/cluster.go b/pkg/cluster/cluster.go index 083bd08ef..b870c9639 100644 --- a/pkg/cluster/cluster.go +++ b/pkg/cluster/cluster.go @@ -20,13 +20,13 @@ import ( "k8s.io/client-go/pkg/types" "k8s.io/client-go/rest" - "github.bus.zalan.do/acid/postgres-operator/pkg/spec" - "github.bus.zalan.do/acid/postgres-operator/pkg/util" - "github.bus.zalan.do/acid/postgres-operator/pkg/util/config" - "github.bus.zalan.do/acid/postgres-operator/pkg/util/constants" - "github.bus.zalan.do/acid/postgres-operator/pkg/util/k8sutil" - "github.bus.zalan.do/acid/postgres-operator/pkg/util/teams" - "github.bus.zalan.do/acid/postgres-operator/pkg/util/users" + "github.com/zalando-incubator/postgres-operator/pkg/spec" + "github.com/zalando-incubator/postgres-operator/pkg/util" + "github.com/zalando-incubator/postgres-operator/pkg/util/config" + "github.com/zalando-incubator/postgres-operator/pkg/util/constants" + "github.com/zalando-incubator/postgres-operator/pkg/util/k8sutil" + "github.com/zalando-incubator/postgres-operator/pkg/util/teams" + "github.com/zalando-incubator/postgres-operator/pkg/util/users" ) var ( diff --git a/pkg/cluster/k8sres.go b/pkg/cluster/k8sres.go index 5a6fe3495..8d454e17e 100644 --- a/pkg/cluster/k8sres.go +++ b/pkg/cluster/k8sres.go @@ -9,8 +9,8 @@ import ( "k8s.io/client-go/pkg/apis/apps/v1beta1" "k8s.io/client-go/pkg/util/intstr" - "github.bus.zalan.do/acid/postgres-operator/pkg/spec" - "github.bus.zalan.do/acid/postgres-operator/pkg/util/constants" + "github.com/zalando-incubator/postgres-operator/pkg/spec" + "github.com/zalando-incubator/postgres-operator/pkg/util/constants" ) const ( diff --git a/pkg/cluster/pg.go b/pkg/cluster/pg.go index 083ac1171..fa325047b 100644 --- a/pkg/cluster/pg.go +++ b/pkg/cluster/pg.go @@ -7,8 +7,8 @@ import ( "github.com/lib/pq" - "github.bus.zalan.do/acid/postgres-operator/pkg/spec" - "github.bus.zalan.do/acid/postgres-operator/pkg/util/constants" + "github.com/zalando-incubator/postgres-operator/pkg/spec" + "github.com/zalando-incubator/postgres-operator/pkg/util/constants" ) var getUserSQL = `SELECT a.rolname, COALESCE(a.rolpassword, ''), a.rolsuper, a.rolinherit, diff --git a/pkg/cluster/pod.go b/pkg/cluster/pod.go index ee8666249..77313db7b 100644 --- a/pkg/cluster/pod.go +++ b/pkg/cluster/pod.go @@ -5,9 +5,9 @@ import ( "k8s.io/client-go/pkg/api/v1" - "github.bus.zalan.do/acid/postgres-operator/pkg/spec" - "github.bus.zalan.do/acid/postgres-operator/pkg/util" - "github.bus.zalan.do/acid/postgres-operator/pkg/util/constants" + "github.com/zalando-incubator/postgres-operator/pkg/spec" + "github.com/zalando-incubator/postgres-operator/pkg/util" + "github.com/zalando-incubator/postgres-operator/pkg/util/constants" ) func (c *Cluster) listPods() ([]v1.Pod, error) { diff --git a/pkg/cluster/resources.go b/pkg/cluster/resources.go index 379a995de..8815aeca7 100644 --- a/pkg/cluster/resources.go +++ b/pkg/cluster/resources.go @@ -7,10 +7,10 @@ import ( "k8s.io/client-go/pkg/api/v1" "k8s.io/client-go/pkg/apis/apps/v1beta1" - "github.bus.zalan.do/acid/postgres-operator/pkg/spec" - "github.bus.zalan.do/acid/postgres-operator/pkg/util" - "github.bus.zalan.do/acid/postgres-operator/pkg/util/constants" - "github.bus.zalan.do/acid/postgres-operator/pkg/util/k8sutil" + "github.com/zalando-incubator/postgres-operator/pkg/spec" + "github.com/zalando-incubator/postgres-operator/pkg/util" + "github.com/zalando-incubator/postgres-operator/pkg/util/constants" + "github.com/zalando-incubator/postgres-operator/pkg/util/k8sutil" ) func (c *Cluster) loadResources() error { diff --git a/pkg/cluster/sync.go b/pkg/cluster/sync.go index 69444444e..07e076d98 100644 --- a/pkg/cluster/sync.go +++ b/pkg/cluster/sync.go @@ -3,7 +3,7 @@ package cluster import ( "fmt" - "github.bus.zalan.do/acid/postgres-operator/pkg/util" + "github.com/zalando-incubator/postgres-operator/pkg/util" ) func (c *Cluster) SyncCluster(stopCh <-chan struct{}) { diff --git a/pkg/cluster/util.go b/pkg/cluster/util.go index 34e0e9029..c76e844e9 100644 --- a/pkg/cluster/util.go +++ b/pkg/cluster/util.go @@ -12,10 +12,10 @@ import ( "k8s.io/client-go/pkg/apis/apps/v1beta1" "k8s.io/client-go/pkg/labels" - "github.bus.zalan.do/acid/postgres-operator/pkg/spec" - "github.bus.zalan.do/acid/postgres-operator/pkg/util" - "github.bus.zalan.do/acid/postgres-operator/pkg/util/constants" - "github.bus.zalan.do/acid/postgres-operator/pkg/util/retryutil" + "github.com/zalando-incubator/postgres-operator/pkg/spec" + "github.com/zalando-incubator/postgres-operator/pkg/util" + "github.com/zalando-incubator/postgres-operator/pkg/util/constants" + "github.com/zalando-incubator/postgres-operator/pkg/util/retryutil" ) func isValidUsername(username string) bool { diff --git a/pkg/controller/controller.go b/pkg/controller/controller.go index 12372ce24..dcb99797b 100644 --- a/pkg/controller/controller.go +++ b/pkg/controller/controller.go @@ -11,10 +11,10 @@ import ( "k8s.io/client-go/rest" "k8s.io/client-go/tools/cache" - "github.bus.zalan.do/acid/postgres-operator/pkg/cluster" - "github.bus.zalan.do/acid/postgres-operator/pkg/spec" - "github.bus.zalan.do/acid/postgres-operator/pkg/util/config" - "github.bus.zalan.do/acid/postgres-operator/pkg/util/teams" + "github.com/zalando-incubator/postgres-operator/pkg/cluster" + "github.com/zalando-incubator/postgres-operator/pkg/spec" + "github.com/zalando-incubator/postgres-operator/pkg/util/config" + "github.com/zalando-incubator/postgres-operator/pkg/util/teams" ) type Config struct { diff --git a/pkg/controller/exec.go b/pkg/controller/exec.go index 196912355..21a73c8d2 100644 --- a/pkg/controller/exec.go +++ b/pkg/controller/exec.go @@ -8,7 +8,7 @@ import ( "k8s.io/kubernetes/pkg/client/unversioned/remotecommand" remotecommandconsts "k8s.io/apimachinery/pkg/util/remotecommand" - "github.bus.zalan.do/acid/postgres-operator/pkg/spec" + "github.com/zalando-incubator/postgres-operator/pkg/spec" ) func (c *Controller) ExecCommand(podName spec.NamespacedName, command []string) (string, error) { diff --git a/pkg/controller/pod.go b/pkg/controller/pod.go index 54b92e2c1..ca27f8b27 100644 --- a/pkg/controller/pod.go +++ b/pkg/controller/pod.go @@ -6,8 +6,8 @@ import ( "k8s.io/client-go/pkg/runtime" "k8s.io/client-go/pkg/watch" - "github.bus.zalan.do/acid/postgres-operator/pkg/spec" - "github.bus.zalan.do/acid/postgres-operator/pkg/util" + "github.com/zalando-incubator/postgres-operator/pkg/spec" + "github.com/zalando-incubator/postgres-operator/pkg/util" ) func (c *Controller) podListFunc(options api.ListOptions) (runtime.Object, error) { diff --git a/pkg/controller/postgresql.go b/pkg/controller/postgresql.go index b9515ea94..4b37689e9 100644 --- a/pkg/controller/postgresql.go +++ b/pkg/controller/postgresql.go @@ -12,10 +12,10 @@ import ( "k8s.io/client-go/pkg/watch" "k8s.io/client-go/tools/cache" - "github.bus.zalan.do/acid/postgres-operator/pkg/cluster" - "github.bus.zalan.do/acid/postgres-operator/pkg/spec" - "github.bus.zalan.do/acid/postgres-operator/pkg/util" - "github.bus.zalan.do/acid/postgres-operator/pkg/util/constants" + "github.com/zalando-incubator/postgres-operator/pkg/cluster" + "github.com/zalando-incubator/postgres-operator/pkg/spec" + "github.com/zalando-incubator/postgres-operator/pkg/util" + "github.com/zalando-incubator/postgres-operator/pkg/util/constants" ) func (c *Controller) clusterListFunc(options api.ListOptions) (runtime.Object, error) { diff --git a/pkg/controller/util.go b/pkg/controller/util.go index 92500dd78..713fcb5f8 100644 --- a/pkg/controller/util.go +++ b/pkg/controller/util.go @@ -7,11 +7,11 @@ import ( "k8s.io/client-go/pkg/api/v1" extv1beta "k8s.io/client-go/pkg/apis/extensions/v1beta1" - "github.bus.zalan.do/acid/postgres-operator/pkg/cluster" - "github.bus.zalan.do/acid/postgres-operator/pkg/spec" - "github.bus.zalan.do/acid/postgres-operator/pkg/util/config" - "github.bus.zalan.do/acid/postgres-operator/pkg/util/constants" - "github.bus.zalan.do/acid/postgres-operator/pkg/util/k8sutil" + "github.com/zalando-incubator/postgres-operator/pkg/cluster" + "github.com/zalando-incubator/postgres-operator/pkg/spec" + "github.com/zalando-incubator/postgres-operator/pkg/util/config" + "github.com/zalando-incubator/postgres-operator/pkg/util/constants" + "github.com/zalando-incubator/postgres-operator/pkg/util/k8sutil" ) func (c *Controller) makeClusterConfig() cluster.Config { diff --git a/pkg/util/config/config.go b/pkg/util/config/config.go index 852c23d0d..561c0fc1f 100644 --- a/pkg/util/config/config.go +++ b/pkg/util/config/config.go @@ -5,7 +5,7 @@ import ( "strings" "time" - "github.bus.zalan.do/acid/postgres-operator/pkg/spec" + "github.com/zalando-incubator/postgres-operator/pkg/spec" ) type TPR struct { diff --git a/pkg/util/k8sutil/k8sutil.go b/pkg/util/k8sutil/k8sutil.go index 92052fb20..6cc4b0dc7 100644 --- a/pkg/util/k8sutil/k8sutil.go +++ b/pkg/util/k8sutil/k8sutil.go @@ -13,9 +13,9 @@ import ( "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" - "github.bus.zalan.do/acid/postgres-operator/pkg/spec" - "github.bus.zalan.do/acid/postgres-operator/pkg/util/constants" - "github.bus.zalan.do/acid/postgres-operator/pkg/util/retryutil" + "github.com/zalando-incubator/postgres-operator/pkg/spec" + "github.com/zalando-incubator/postgres-operator/pkg/util/constants" + "github.com/zalando-incubator/postgres-operator/pkg/util/retryutil" ) func RestConfig(kubeConfig string, outOfCluster bool) (*rest.Config, error) { diff --git a/pkg/util/users/users.go b/pkg/util/users/users.go index bd7a54e8f..1e6de353b 100644 --- a/pkg/util/users/users.go +++ b/pkg/util/users/users.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" - "github.bus.zalan.do/acid/postgres-operator/pkg/spec" - "github.bus.zalan.do/acid/postgres-operator/pkg/util" + "github.com/zalando-incubator/postgres-operator/pkg/spec" + "github.com/zalando-incubator/postgres-operator/pkg/util" ) const ( diff --git a/pkg/util/util.go b/pkg/util/util.go index f0e1b045b..d12c66a4a 100644 --- a/pkg/util/util.go +++ b/pkg/util/util.go @@ -11,7 +11,7 @@ import ( "github.com/motomux/pretty" "k8s.io/client-go/pkg/api/v1" - "github.bus.zalan.do/acid/postgres-operator/pkg/spec" + "github.com/zalando-incubator/postgres-operator/pkg/spec" ) const (