feat(builder): unified build model

Author: duanhongyi

README.md

@@ -23,8 +23,9 @@ The builder is primarily a git server that responds to `git push`es by executing
 	- If the `BUILDER_STORAGE` environment variable is other than `minio`, attempts to create the appropriate storage driver and saves using this driver.
   - Otherwise, if `BUILDER_STORAGE` is `minio` and the `DRYCC_MINIO_SERVICE_HOST` and `DRYCC_MINIO_SERVICE_PORT` environment variables exist (these are standard [Kubernetes service discovery environment variables](http://kubernetes.io/docs/user-guide/services/#environment-variables)), saves to the [S3 API][s3-api-ref] compatible server at `http://$DRYCC_MINIO_SERVICE_HOST:$DRYCC_MINIO_SERVICE_HOST`
 3. Starts a new [Kubernetes Pod](http://kubernetes.io/docs/user-guide/pods/) to build the code, according to the following rules:
-  - If a `Dockerfile` is present in the codebase, starts a [`imagebuilder`](https://github.com/drycc/imagebuilder) pod, configured to download the code to build from the URL computed in the previous step.
-  - Otherwise, starts a [`buildpacker`](https://github.com/drycc/buildpacker) pod, configured to download the code to build from the URL computed in the previous step.
+  - If there is a `Dockerfile`, build the container with imagebuilder
+  - Otherwise, use imagebuilder to build CNCF native buildpack
+  - You can use `DRYCC_STACK` specifies the build type. Currently, it supports two types: `buildpack` and `container`
 
 # Supported Off-Cluster Storage Backends
 

charts/builder/templates/builder-deployment.yaml

@@ -58,11 +58,6 @@ spec:
             # Set GIT_LOCK_TIMEOUT to number of minutes you want to wait to git push again to the same repository
             - name: "GIT_LOCK_TIMEOUT"
               value: "30"
-            - name: buildpackER_IMAGE_PULL_POLICY
-              valueFrom:
-                configMapKeyRef:
-                  name: build pa c ker-config
-                  key: image_pull_policy
             - name: IMAGEBUILDER_IMAGE_PULL_POLICY
               valueFrom:
                 configMapKeyRef:
@@ -108,9 +103,6 @@ spec:
             - name: objectstore-creds
               mountPath: /var/run/secrets/drycc/objectstore/creds
               readOnly: true
-            - name: buildpacker-config
-              mountPath: /etc/buildpacker
-              readOnly: true
             - name: imagebuilder-config
               mountPath: /etc/imagebuilder
               readOnly: true
@@ -124,9 +116,6 @@ spec:
         - name: objectstore-creds
           secret:
             secretName: objectstorage-keyfile
-        - name: buildpacker-config
-          configMap:
-            name: buildpacker-config
         - name: imagebuilder-config
           configMap:
             name: imagebuilder-config

go.mod

@@ -8,7 +8,7 @@ require (
 	github.com/codegangsta/cli v1.9.0
 	github.com/docker/distribution v2.7.1+incompatible
 	github.com/docker/go-metrics v0.0.1 // indirect
-	github.com/drycc/controller-sdk-go v0.0.0-20201015065118-cb8f4f5e9745
+	github.com/drycc/controller-sdk-go v0.0.0-20210629042308-95dbca4156e7
 	github.com/drycc/pkg v0.0.0-20200811173146-1f2b2781a852
 	github.com/gorilla/mux v1.7.4 // indirect
 	github.com/kelseyhightower/envconfig v1.2.0

go.sum

@@ -51,6 +51,8 @@ github.com/drycc/controller-sdk-go v0.0.0-20200829135849-1d24c6efe272 h1:ez+63Rq
 github.com/drycc/controller-sdk-go v0.0.0-20200829135849-1d24c6efe272/go.mod h1:mF8/kZ/E4oDHCtfUVS790Frm8oVzZkoCGCKYT2eWQro=
 github.com/drycc/controller-sdk-go v0.0.0-20201015065118-cb8f4f5e9745 h1:C3Byx1KvZtzuilCp5aikRa5hbXCUhiy8u4Iv6ATyDcI=
 github.com/drycc/controller-sdk-go v0.0.0-20201015065118-cb8f4f5e9745/go.mod h1:mF8/kZ/E4oDHCtfUVS790Frm8oVzZkoCGCKYT2eWQro=
+github.com/drycc/controller-sdk-go v0.0.0-20210629042308-95dbca4156e7 h1:Ujpe0wvzPBGd/IoBOwqNoS4XSYziw1vF0U9Jr2MjrCk=
+github.com/drycc/controller-sdk-go v0.0.0-20210629042308-95dbca4156e7/go.mod h1:mF8/kZ/E4oDHCtfUVS790Frm8oVzZkoCGCKYT2eWQro=
 github.com/drycc/pkg v0.0.0-20200730070607-a183b894cef1 h1:k8fWNiR7LVmy3lYFDuAuOw+ATJNkTjChaE3AeU0B6u8=
 github.com/drycc/pkg v0.0.0-20200730070607-a183b894cef1/go.mod h1:H6rDYnCiVX4k0B8T57myWlRMQoTx3hsvyAQV9//4T2Q=
 github.com/drycc/pkg v0.0.0-20200811173146-1f2b2781a852 h1:OsWH7jrv2i32rkvHFuj3yVpGMR+A6heRge9tm01XR/U=

pkg/gitreceive/build.go

@@ -18,7 +18,6 @@ import (
 	"github.com/drycc/builder/pkg/controller"
 	"github.com/drycc/builder/pkg/git"
 	"github.com/drycc/builder/pkg/k8s"
-	"github.com/drycc/builder/pkg/storage"
 	"github.com/drycc/builder/pkg/sys"
 	dryccAPI "github.com/drycc/controller-sdk-go/api"
 	"github.com/drycc/controller-sdk-go/hooks"
@@ -141,35 +140,25 @@ func build(
 	if err != nil {
 		return fmt.Errorf("error build builder pod node selector %s", err)
 	}
-
-	var builderName string
-	var imagePullPolicy corev1.PullPolicy
-	var securityContext corev1.SecurityContext
-	if strings.Contains(stack["name"], "container") {
-		builderName = "drycc-imagebuilder"
-		imagePullPolicy, err = k8s.PullPolicyFromString(conf.ImagebuilderImagePullPolicy)
-		securityContext = k8s.SecurityContextFromPrivileged(false)
-
-	} else {
-		builderName = "drycc-buildpacker"
-		imagePullPolicy, err = k8s.PullPolicyFromString(conf.BuildpackerImagePullPolicy)
-		securityContext = k8s.SecurityContextFromPrivileged(true)
-	}
+	builderName := "drycc-imagebuilder"
+	imagePullPolicy, err := k8s.PullPolicyFromString(conf.ImagebuilderImagePullPolicy)
 	if err != nil {
 		return err
 	}
+	securityContext := k8s.SecurityContextFromPrivileged(true)
 
 	imageName := fmt.Sprintf("%s:git-%s", appName, gitSha.Short())
 	buildPodName := imagebuilderPodName(appName, gitSha.Short())
 	registryLocation := conf.RegistryLocation
-	registryEnv := make(map[string]string)
+	builderImageEnv := make(map[string]string)
 	if registryLocation != "on-cluster" {
-		registryEnv, err = getRegistryDetails(kubeClient.CoreV1(), &imageName, registryLocation, conf.PodNamespace)
+		builderImageEnv, err = getRegistryDetails(kubeClient.CoreV1(), &imageName, registryLocation, conf.PodNamespace)
 		if err != nil {
 			return fmt.Errorf("error getting private registry details %s", err)
 		}
 	}
-	registryEnv["DRYCC_REGISTRY_LOCATION"] = registryLocation
+	builderImageEnv["DRYCC_STACK"] = stack["name"]
+	builderImageEnv["DRYCC_REGISTRY_LOCATION"] = registryLocation
 
 	pod := createBuilderPod(
 		conf.Debug,
@@ -184,7 +173,7 @@ func build(
 		stack["image"],
 		conf.RegistryHost,
 		conf.RegistryPort,
-		registryEnv,
+		builderImageEnv,
 		imagePullPolicy,
 		securityContext,
 		builderPodNodeSelector,
@@ -260,16 +249,19 @@ func build(
 	}
 	log.Debug("Done")
 
-	procType, err := getProcfile(storageDriver, tmpDir, stack)
+	procfile, err := getProcfile(tmpDir, stack)
+	if err != nil {
+		return err
+	}
+	dockerfile, err := getDockerfile(tmpDir, stack)
 	if err != nil {
 		return err
 	}
-
 	log.Info("Build complete.")
 
 	quit := progress("...", conf.SessionIdleInterval())
 	log.Info("Launching App...")
-	release, err := hooks.CreateBuild(client, conf.Username, conf.App(), imageName, stack["name"], gitSha.Short(), procType, stack["name"] == "container")
+	release, err := hooks.CreateBuild(client, conf.Username, conf.App(), imageName, stack["name"], gitSha.Short(), procfile, dockerfile)
 	quit <- true
 	<-quit
 	if controller.CheckAPICompat(client, err) != nil {
@@ -311,21 +303,34 @@ func prettyPrintJSON(data interface{}) (string, error) {
 	return formatted.String(), nil
 }
 
-func getProcfile(getter storage.ObjectGetter, dirName string, stack map[string]string) (dryccAPI.ProcessType, error) {
-	procType := dryccAPI.ProcessType{}
+func getProcfile(dirName string, stack map[string]string) (dryccAPI.ProcessType, error) {
+	procfile := dryccAPI.ProcessType{}
 	_, err := os.Stat(fmt.Sprintf("%s/project.toml", dirName))
 	if err == nil || stack["name"] == "container" {
-		return procType, nil
+		return procfile, nil
 	}
 	if _, err := os.Stat(fmt.Sprintf("%s/Procfile", dirName)); err == nil {
 		rawProcFile, err := ioutil.ReadFile(fmt.Sprintf("%s/Procfile", dirName))
 		if err != nil {
 			return nil, fmt.Errorf("error in reading %s/Procfile (%s)", dirName, err)
 		}
-		if err := yaml.Unmarshal(rawProcFile, &procType); err != nil {
+		if err := yaml.Unmarshal(rawProcFile, &procfile); err != nil {
 			return nil, fmt.Errorf("procfile %s/ProcFile is malformed (%s)", dirName, err)
 		}
-		return procType, nil
+		return procfile, nil
 	}
 	return nil, fmt.Errorf("no Procfile can be matched in (%s)", dirName)
 }
+
+func getDockerfile(dirName string, stack map[string]string) (string, error) {
+	if stack["name"] == "container" {
+		if _, err := os.Stat(fmt.Sprintf("%s/Dockerfile", dirName)); err == nil {
+			rawDockerfile, err := ioutil.ReadFile(fmt.Sprintf("%s/Dockerfile", dirName))
+			if err != nil {
+				return "", fmt.Errorf("error in reading %s/Dockerfile (%s)", dirName, err)
+			}
+			return string(rawDockerfile), nil
+		}
+	}
+	return "", nil
+}

pkg/gitreceive/build_test.go

@@ -2,8 +2,6 @@ package gitreceive
 
 import (
 	"bytes"
-	"context"
-	"errors"
 	"fmt"
 	"io/ioutil"
 	"os"
@@ -17,17 +15,12 @@ import (
 	"github.com/docker/distribution/registry/storage/driver/factory"
 	_ "github.com/docker/distribution/registry/storage/driver/inmemory"
 	builderconf "github.com/drycc/builder/pkg/conf"
-	"github.com/drycc/builder/pkg/storage"
 	"github.com/drycc/builder/pkg/sys"
 	"github.com/drycc/controller-sdk-go/api"
 	"github.com/drycc/pkg/log"
 	"gopkg.in/yaml.v2"
 )
 
-const (
-	objKey = "myobj"
-)
-
 type testJSONStruct struct {
 	Foo string `json:"foo,omitempty"`
 }
@@ -68,11 +61,9 @@ func TestBuild(t *testing.T) {
 
 	config.ImagebuilderImagePullPolicy = "Always"
 	if err := build(config, storageDriver, nil, fs, env, "foo", sha); err == nil {
-		t.Error("expected running build() without setting config.BuildpackerImagePullPolicy to fail")
+		t.Error("expected running build() without setting config.ImagebuilderImagePullPolicy to fail")
 	}
 
-	config.BuildpackerImagePullPolicy = "Always"
-
 	err = build(config, storageDriver, nil, fs, env, "foo", "abc123")
 	expected := "git sha abc123 was invalid"
 	if err.Error() != expected {
@@ -122,12 +113,11 @@ func TestGetProcfileFromRepoSuccess(t *testing.T) {
 			t.Fatalf("failed to remove Procfile from %s (%s)", tmpDir, err)
 		}
 	}()
-	getter := &storage.FakeObjectGetter{}
 	config := api.Config{}
 	config.Values = map[string]interface{}{
 		"DRYCC_STACK": "buildpack",
 	}
-	procType, err := getProcfile(getter, tmpDir, getStack(tmpDir, config))
+	procType, err := getProcfile(tmpDir, getStack(tmpDir, config))
 	actualData := api.ProcessType{}
 	yaml.Unmarshal(data, &actualData)
 	assert.NoErr(t, err)
@@ -148,48 +138,36 @@ func TestGetProcfileFromRepoFailure(t *testing.T) {
 			t.Fatalf("failed to remove Procfile from %s (%s)", tmpDir, err)
 		}
 	}()
-	getter := &storage.FakeObjectGetter{}
 	config := api.Config{}
 	config.Values = map[string]interface{}{
 		"DRYCC_STACK": "buildpack",
 	}
-	_, err = getProcfile(getter, tmpDir, getStack(tmpDir, config))
+	_, err = getProcfile(tmpDir, getStack(tmpDir, config))
 
 	assert.True(t, err != nil, "no error received when there should have been")
 }
 
 func TestGetProcfileFromServerSuccess(t *testing.T) {
 	data := []byte("web: example-go")
-	getter := &storage.FakeObjectGetter{
-		Fn: func(context.Context, string) ([]byte, error) {
-			return data, nil
-		},
-	}
 	tmpDir := os.TempDir()
 	config := api.Config{}
 	config.Values = map[string]interface{}{
 		"DRYCC_STACK": "buildpack",
 	}
 
-	_, err := getProcfile(getter, "", getStack(tmpDir, config))
+	_, err := getProcfile("", getStack(tmpDir, config))
 	actualData := api.ProcessType{}
 	yaml.Unmarshal(data, &actualData)
 	assert.Err(t, err, fmt.Errorf("no Procfile can be matched in (%s)", ""))
 }
 
 func TestGetProcfileFromServerFailure(t *testing.T) {
-	expectedErr := errors.New("test error")
-	getter := &storage.FakeObjectGetter{
-		Fn: func(context.Context, string) ([]byte, error) {
-			return []byte("web: example-go"), expectedErr
-		},
-	}
 	tmpDir := os.TempDir()
 	config := api.Config{}
 	config.Values = map[string]interface{}{
 		"DRYCC_STACK": "buildpack",
 	}
-	_, err := getProcfile(getter, "", getStack(tmpDir, config))
+	_, err := getProcfile("", getStack(tmpDir, config))
 	assert.Err(t, err, fmt.Errorf("no Procfile can be matched in (%s)", ""))
 	assert.True(t, err != nil, "no error received when there should have been")
 }

pkg/gitreceive/build_type.go

@@ -14,7 +14,7 @@ import (
 var defaultStacks = `[
 	{
         "name": "buildpack",
-        "image": "drycc/buildpacker:canary"
+        "image": "drycc/imagebuilder:canary"
     },
     {
         "name": "container",
@@ -28,24 +28,11 @@ var Stacks []map[string]string
 
 // initStack load stack by config
 func initStack() error {
-	data, err := ioutil.ReadFile("/etc/buildpacker/images.json")
+	data, err := ioutil.ReadFile("/etc/imagebuilder/images.json")
 	if err == nil {
-		var stacksBuildpacker []map[string]string
-		err = json.Unmarshal(data, &stacksBuildpacker)
-		if err == nil {
-			data, err = ioutil.ReadFile("/etc/imagebuilder/images.json")
-			if err == nil {
-				var stacksImagebuilder []map[string]string
-				err = json.Unmarshal(data, &stacksImagebuilder)
-				if err == nil {
-					// Stacks order represents priority
-					Stacks = stacksImagebuilder
-					Stacks = append(Stacks, stacksBuildpacker...)
-				}
-				return nil
-			}
-		}
+		return json.Unmarshal(data, &Stacks)
 	}
+
 	return json.Unmarshal([]byte(defaultStacks), &Stacks)
 }
 

pkg/gitreceive/config.go

@@ -34,7 +34,6 @@ type Config struct {
 	ObjectStorageTickDurationMSec int    `envconfig:"OBJECT_STORAGE_TICK_DURATION" default:"500"`
 	ObjectStorageWaitDurationMSec int    `envconfig:"OBJECT_STORAGE_WAIT_DURATION" default:"300000"` // 5 minutes
 	SessionIdleIntervalMsec       int    `envconfig:"SESSION_IDLE_INTERVAL" default:"10000"`         // 10 seconds
-	BuildpackerImagePullPolicy    string `envconfig:"BUILDPACKER_IMAGE_PULL_POLICY" default:"Always"`
 	ImagebuilderImagePullPolicy   string `envconfig:"IMAGEBUILDER_IMAGE_PULL_POLICY" default:"Always"`
 	StorageType                   string `envconfig:"BUILDER_STORAGE" default:"minio"`
 	BuilderPodNodeSelector        string `envconfig:"BUILDER_POD_NODE_SELECTOR" default:""`

pkg/gitreceive/k8s_util.go

@@ -17,12 +17,14 @@ import (
 )
 
 const (
-	tarPath         = "TAR_PATH"
-	debugKey        = "DRYCC_DEBUG"
-	sourceVersion   = "SOURCE_VERSION"
-	objectStore     = "objectstorage-keyfile"
-	builderStorage  = "BUILDER_STORAGE"
-	objectStorePath = "/var/run/secrets/drycc/objectstore/creds"
+	tarPath                = "TAR_PATH"
+	debugKey               = "DRYCC_DEBUG"
+	sourceVersion          = "SOURCE_VERSION"
+	objectStore            = "objectstorage-keyfile"
+	builderStorage         = "BUILDER_STORAGE"
+	objectStorePath        = "/var/run/secrets/drycc/objectstore/creds"
+	imagebuilderConfig     = "imagebuilder-config"
+	imagebuilderConfigPath = "/etc/imagebuilder"
 )
 
 func imagebuilderPodName(appName, shortSha string) string {
@@ -48,7 +50,7 @@ func createBuilderPod(
 	builderImage,
 	registryHost,
 	registryPort string,
-	registryEnv map[string]string,
+	builderImageEnv map[string]string,
 	pullPolicy corev1.PullPolicy,
 	securityContext corev1.SecurityContext,
 	nodeSelector map[string]string,
@@ -80,7 +82,7 @@ func createBuilderPod(
 	addEnvToPod(pod, "DRYCC_REGISTRY_PROXY_HOST", registryHost)
 	addEnvToPod(pod, "DRYCC_REGISTRY_PROXY_PORT", registryPort)
 
-	for key, value := range registryEnv {
+	for key, value := range builderImageEnv {
 		addEnvToPod(pod, key, value)
 	}
 
@@ -132,6 +134,24 @@ func buildPod(
 			ReadOnly:  true,
 		},
 	}
+	pod.Spec.Volumes = append(pod.Spec.Volumes, corev1.Volume{
+		Name: objectStore,
+		VolumeSource: corev1.VolumeSource{
+			ConfigMap: &corev1.ConfigMapVolumeSource{
+				LocalObjectReference: corev1.LocalObjectReference{
+					Name: imagebuilderConfig,
+				},
+			},
+		},
+	})
+
+	pod.Spec.Containers[0].VolumeMounts = []corev1.VolumeMount{
+		{
+			Name:      imagebuilderConfig,
+			MountPath: imagebuilderConfigPath,
+			ReadOnly:  true,
+		},
+	}
 
 	if len(pod.Spec.Containers) > 0 {
 		for k, v := range env {