Merge pull request #262 from kmala/storage

feat(storage): implement separate storage layer

Author: kmala

boot.go

@@ -13,9 +13,13 @@ import (
 	"github.com/deis/builder/pkg/gitreceive"
 	"github.com/deis/builder/pkg/healthsrv"
 	"github.com/deis/builder/pkg/sshd"
-	"github.com/deis/builder/pkg/storage"
 	"github.com/deis/builder/pkg/sys"
 	pkglog "github.com/deis/pkg/log"
+	storagedriver "github.com/docker/distribution/registry/storage/driver"
+	_ "github.com/docker/distribution/registry/storage/driver/azure"
+	"github.com/docker/distribution/registry/storage/driver/factory"
+	_ "github.com/docker/distribution/registry/storage/driver/gcs"
+	_ "github.com/docker/distribution/registry/storage/driver/s3-aws"
 	kcl "k8s.io/kubernetes/pkg/client/unversioned"
 )
 
@@ -49,16 +53,27 @@ func main() {
 					pkglog.Err("getting config for %s [%s]", serverConfAppName, err)
 					os.Exit(1)
 				}
-				env := sys.RealEnv()
 				fs := sys.RealFS()
+				env := sys.RealEnv()
 				pushLock := sshd.NewInMemoryRepositoryLock()
 				circ := sshd.NewCircuit()
 
-				s3Client, err := storage.GetClient(cnf.HealthSrvTestStorageRegion, fs, env)
+				storageParams, err := conf.GetStorageParams(env)
 				if err != nil {
-					log.Printf("Error getting s3 client (%s)", err)
+					log.Printf("Error getting storage parameters (%s)", err)
 					os.Exit(1)
 				}
+				var storageDriver storagedriver.StorageDriver
+				if cnf.StorageType == "minio" {
+					storageDriver, err = factory.Create("s3", storageParams)
+				} else {
+					storageDriver, err = factory.Create(cnf.StorageType, storageParams)
+				}
+				if err != nil {
+					log.Printf("Error creating storage driver (%s)", err)
+					os.Exit(1)
+				}
+
 				kubeClient, err := kcl.NewInCluster()
 				if err != nil {
 					log.Printf("Error getting kubernetes client [%s]", err)
@@ -67,7 +82,7 @@ func main() {
 				log.Printf("Starting health check server on port %d", cnf.HealthSrvPort)
 				healthSrvCh := make(chan error)
 				go func() {
-					if err := healthsrv.Start(cnf.HealthSrvPort, kubeClient.Namespaces(), s3Client, circ); err != nil {
+					if err := healthsrv.Start(cnf.HealthSrvPort, kubeClient.Namespaces(), storageDriver, circ); err != nil {
 						healthSrvCh <- err
 					}
 				}()
@@ -111,8 +126,23 @@ func main() {
 				cnf.CheckDurations()
 				fs := sys.RealFS()
 				env := sys.RealEnv()
+				storageParams, err := conf.GetStorageParams(env)
+				if err != nil {
+					log.Printf("Error getting storage parameters (%s)", err)
+					os.Exit(1)
+				}
+				var storageDriver storagedriver.StorageDriver
+				if cnf.StorageType == "minio" {
+					storageDriver, err = factory.Create("s3", storageParams)
+				} else {
+					storageDriver, err = factory.Create(cnf.StorageType, storageParams)
+				}
+				if err != nil {
+					log.Printf("Error creating storage driver (%s)", err)
+					os.Exit(1)
+				}
 
-				if err := gitreceive.Run(cnf, fs, env); err != nil {
+				if err := gitreceive.Run(cnf, fs, env, storageDriver); err != nil {
 					log.Printf("Error running git receive hook [%s]", err)
 					os.Exit(1)
 				}

glide.lock

@@ -32,4 +32,6 @@ import:
   version: ~1.1
 - package: github.com/arschles/assert
   version: 6882f85ccdc7c1822b146d1a6b0c2c48f91b5140
-- package: github.com/minio/minio-go
+- package: github.com/docker/distribution
+  repo: https://github.com/deis/distribution
+  vcs: git

glide.yaml

@@ -4,13 +4,20 @@ import (
 	"fmt"
 	"io/ioutil"
 
+	"github.com/deis/builder/pkg/sys"
 	"github.com/kelseyhightower/envconfig"
 )
 
 const (
-	builderKeyLocation = "/var/run/secrets/api/auth/builder-key"
+	builderKeyLocation  = "/var/run/secrets/api/auth/builder-key"
+	storageCredLocation = "/var/run/secrets/deis/objectstore/creds/"
+	minioHostEnvVar     = "DEIS_MINIO_SERVICE_HOST"
+	minioPortEnvVar     = "DEIS_MINIO_SERVICE_PORT"
+	gcsKey              = "key.json"
 )
 
+type Parameters map[string]interface{}
+
 // EnvConfig is a convenience function to process the envconfig (
 // https://github.com/kelseyhightower/envconfig) based configuration environment variables into
 // conf. Additional notes:
@@ -35,3 +42,36 @@ func GetBuilderKey() (string, error) {
 	builderKey := string(builderKeyBytes)
 	return builderKey, nil
 }
+
+func GetStorageParams(env sys.Env) (Parameters, error) {
+	params := make(map[string]interface{})
+	files, err := ioutil.ReadDir(storageCredLocation)
+	if err != nil {
+		return nil, err
+	}
+
+	for _, file := range files {
+		data, err := ioutil.ReadFile(storageCredLocation + file.Name())
+		if err != nil {
+			return nil, err
+		}
+		//GCS expect the to have the location of the service account credential json file
+		if file.Name() == gcsKey {
+			params["keyfile"] = storageCredLocation + file.Name()
+		} else {
+			params[file.Name()] = string(data)
+		}
+	}
+	params["bucket"] = params["builder-bucket"]
+	params["container"] = params["builder-container"]
+	if env.Get("BUILDER_STORAGE") == "minio" {
+		mHost := env.Get(minioHostEnvVar)
+		mPort := env.Get(minioPortEnvVar)
+		params["regionendpoint"] = fmt.Sprintf("http://%s:%s", mHost, mPort)
+		params["secure"] = false
+		params["region"] = "us-east-1"
+		params["bucket"] = "git"
+	}
+
+	return params, nil
+}