From 256ff37c19da933a2ddb8b86fd159956447021d8 Mon Sep 17 00:00:00 2001
From: Murat Kabilov <murat.kabilov@zalando.de>
Date: Mon, 23 Jan 2017 16:04:16 +0100
Subject: [PATCH] refactor file tree structure

---
 README.md                                  |  4 ++--
 main.go => cmd/main.go                     |  6 +++---
 {operator => pkg/controller}/etcd.go       |  2 +-
 {operator => pkg/controller}/objects.go    |  2 +-
 {operator => pkg/controller}/operator.go   |  2 +-
 {operator => pkg/controller}/spilo.go      | 10 +++++-----
 {operator => pkg/controller}/supervisor.go |  2 +-
 7 files changed, 14 insertions(+), 14 deletions(-)
 rename main.go => cmd/main.go (86%)
 rename {operator => pkg/controller}/etcd.go (96%)
 rename {operator => pkg/controller}/objects.go (99%)
 rename {operator => pkg/controller}/operator.go (99%)
 rename {operator => pkg/controller}/spilo.go (93%)
 rename {operator => pkg/controller}/supervisor.go (99%)

diff --git a/README.md b/README.md
index 99dae629f..19e748bdf 100644
--- a/README.md
+++ b/README.md
@@ -29,11 +29,11 @@
 
 ### Build dependencies
 
-    $ go build -i -v
+    $ go build -i -v cmd
 
 ### Run operator (outside kubernetes cluster)
     
-    $ go run main.go
+    $ go run cmd/main.go
     
 ### Check if ThirdPartyResource has been registered
 
diff --git a/main.go b/cmd/main.go
similarity index 86%
rename from main.go
rename to cmd/main.go
index f08c04785..0e2aab0e6 100644
--- a/main.go
+++ b/cmd/main.go
@@ -8,11 +8,11 @@ import (
 	"sync"
 	"syscall"
 
-	"github.bus.zalan.do/acid/postgres-operator/operator"
+	"github.bus.zalan.do/acid/postgres-operator/pkg/controller"
 	"github.com/spf13/pflag"
 )
 
-var options operator.Options
+var options controller.Options
 
 func init() {
 	pflag.StringVar(&options.KubeConfig, "kubeconfig", "", "Path to kubeconfig file with authorization and master location information.")
@@ -31,7 +31,7 @@ func main() {
 
 	wg := &sync.WaitGroup{} // Goroutines can add themselves to this to be waited on
 
-	spiloOperator := operator.New(options)
+	spiloOperator := controller.New(options)
 	spiloOperator.Run(stop, wg)
 
 	sig := <-sigs // Wait for signals (this hangs until a signal arrives)
diff --git a/operator/etcd.go b/pkg/controller/etcd.go
similarity index 96%
rename from operator/etcd.go
rename to pkg/controller/etcd.go
index 4ae0b2d6f..452f72218 100644
--- a/operator/etcd.go
+++ b/pkg/controller/etcd.go
@@ -1,4 +1,4 @@
-package operator
+package controller
 
 import (
 	"fmt"
diff --git a/operator/objects.go b/pkg/controller/objects.go
similarity index 99%
rename from operator/objects.go
rename to pkg/controller/objects.go
index 2a1370848..cbaf6f640 100644
--- a/operator/objects.go
+++ b/pkg/controller/objects.go
@@ -1,4 +1,4 @@
-package operator
+package controller
 
 import (
 	"k8s.io/client-go/pkg/api/resource"
diff --git a/operator/operator.go b/pkg/controller/operator.go
similarity index 99%
rename from operator/operator.go
rename to pkg/controller/operator.go
index fa068d28f..e7572b8e1 100644
--- a/operator/operator.go
+++ b/pkg/controller/operator.go
@@ -1,4 +1,4 @@
-package operator
+package controller
 
 import (
 	"fmt"
diff --git a/operator/spilo.go b/pkg/controller/spilo.go
similarity index 93%
rename from operator/spilo.go
rename to pkg/controller/spilo.go
index ed48fecdd..3b226956c 100644
--- a/operator/spilo.go
+++ b/pkg/controller/spilo.go
@@ -1,4 +1,4 @@
-package operator
+package controller
 
 import (
 	"encoding/json"
@@ -44,10 +44,10 @@ func New(options Options) *SpiloOperator {
 	}
 
 	operator := &SpiloOperator{
-		Options:        options,
-		ClientSet:      clientSet,
-		Client:    spiloClient,
-		Supervisor: newSupervisor(spiloClient, clientSet),
+		Options:     options,
+		ClientSet:   clientSet,
+		Client:      spiloClient,
+		Supervisor:  newSupervisor(spiloClient, clientSet),
 	}
 
 	return operator
diff --git a/operator/supervisor.go b/pkg/controller/supervisor.go
similarity index 99%
rename from operator/supervisor.go
rename to pkg/controller/supervisor.go
index f345cf1d7..cd8e4455b 100644
--- a/operator/supervisor.go
+++ b/pkg/controller/supervisor.go
@@ -1,4 +1,4 @@
-package operator
+package controller
 
 import (
 	"fmt"