Merge pull request #1496 from adieu/master

Separate tiller into pkg and cmd so we can use tiller as a library.

cmd/tiller/tiller.go

@@ -25,9 +25,11 @@ import (
 	"github.com/spf13/cobra"
 	"google.golang.org/grpc"
 
-	"k8s.io/helm/cmd/tiller/environment"
+	"k8s.io/helm/pkg/proto/hapi/services"
 	"k8s.io/helm/pkg/storage"
 	"k8s.io/helm/pkg/storage/driver"
+	"k8s.io/helm/pkg/tiller"
+	"k8s.io/helm/pkg/tiller/environment"
 )
 
 const (
@@ -104,6 +106,8 @@ func start(c *cobra.Command, args []string) {
 	srvErrCh := make(chan error)
 	probeErrCh := make(chan error)
 	go func() {
+		svc := tiller.NewReleaseServer(env)
+		services.RegisterReleaseServiceServer(rootServer, svc)
 		if err := rootServer.Serve(lstn); err != nil {
 			srvErrCh <- err
 		}

cmd/tiller/tiller_test.go

@@ -19,8 +19,8 @@ package main
 import (
 	"testing"
 
-	"k8s.io/helm/cmd/tiller/environment"
 	"k8s.io/helm/pkg/engine"
+	"k8s.io/helm/pkg/tiller/environment"
 )
 
 // These are canary tests to make sure that the default server actually

cmd/tiller/hooks.go → pkg/tiller/hooks.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package main
+package tiller
 
 import (
 	"fmt"

cmd/tiller/hooks_test.go → pkg/tiller/hooks_test.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package main
+package tiller
 
 import (
 	"testing"

cmd/tiller/kind_sorter.go → pkg/tiller/kind_sorter.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package main
+package tiller
 
 import (
 	"sort"

cmd/tiller/kind_sorter_test.go → pkg/tiller/kind_sorter_test.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package main
+package tiller
 
 import (
 	"testing"

cmd/tiller/release_history.go → pkg/tiller/release_history.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package main
+package tiller
 
 import (
 	"golang.org/x/net/context"
@@ -22,7 +22,7 @@ import (
 	relutil "k8s.io/helm/pkg/releaseutil"
 )
 
-func (s *releaseServer) GetHistory(ctx context.Context, req *tpb.GetHistoryRequest) (*tpb.GetHistoryResponse, error) {
+func (s *ReleaseServer) GetHistory(ctx context.Context, req *tpb.GetHistoryRequest) (*tpb.GetHistoryResponse, error) {
 	if !checkClientVersion(ctx) {
 		return nil, errIncompatibleVersion
 	}

cmd/tiller/release_history_test.go → pkg/tiller/release_history_test.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package main
+package tiller
 
 import (
 	"reflect"

cmd/tiller/release_server_test.go → pkg/tiller/release_server_test.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package main
+package tiller
 
 import (
 	"errors"
@@ -29,13 +29,13 @@ import (
 	"golang.org/x/net/context"
 	"google.golang.org/grpc/metadata"
 
-	"k8s.io/helm/cmd/tiller/environment"
 	"k8s.io/helm/pkg/helm"
 	"k8s.io/helm/pkg/proto/hapi/chart"
 	"k8s.io/helm/pkg/proto/hapi/release"
 	"k8s.io/helm/pkg/proto/hapi/services"
 	"k8s.io/helm/pkg/storage"
 	"k8s.io/helm/pkg/storage/driver"
+	"k8s.io/helm/pkg/tiller/environment"
 )
 
 const notesText = "my notes here"
@@ -70,8 +70,8 @@ data:
   name: value
 `
 
-func rsFixture() *releaseServer {
-	return &releaseServer{
+func rsFixture() *ReleaseServer {
+	return &ReleaseServer{
 		env: mockEnvironment(),
 	}
 }