feat(builder): add cloud native buildpacks support

Author: duanhongyi

README.md

@@ -24,7 +24,7 @@ The builder is primarily a git server that responds to `git push`es by executing
   - 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 [`slugbuilder`](https://github.com/drycc/slugbuilder) 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.
 
 # Supported Off-Cluster Storage Backends
 

charts/builder/templates/builder-deployment.yaml

@@ -58,10 +58,10 @@ 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: SLUGBUILDER_IMAGE_PULL_POLICY
+            - name: buildpackER_IMAGE_PULL_POLICY
               valueFrom:
                 configMapKeyRef:
-                  name: slugbuilder-config
+                  name: build pa c ker-config
                   key: image_pull_policy
             - name: IMAGEBUILDER_IMAGE_PULL_POLICY
               valueFrom:
@@ -108,8 +108,8 @@ spec:
             - name: objectstore-creds
               mountPath: /var/run/secrets/drycc/objectstore/creds
               readOnly: true
-            - name: slugbuilder-config
-              mountPath: /etc/slugbuilder
+            - name: buildpacker-config
+              mountPath: /etc/buildpacker
               readOnly: true
             - name: imagebuilder-config
               mountPath: /etc/imagebuilder
@@ -124,9 +124,9 @@ spec:
         - name: objectstore-creds
           secret:
             secretName: objectstorage-keyfile
-        - name: slugbuilder-config
+        - name: buildpacker-config
           configMap:
-            name: slugbuilder-config
+            name: buildpacker-config
         - name: imagebuilder-config
           configMap:
             name: imagebuilder-config

pkg/builder.go

@@ -1,6 +1,6 @@
 // Package pkg provides common libraries for the Drycc builder.
 //
-// The Drycc builder is responsible for building slugs and docker images for use in the Drycc
+// The Drycc builder is responsible for building buildpack and docker images for use in the Drycc
 // on the Drycc PaaS platform.
 package pkg
 

pkg/cleaner/cleaner.go

@@ -18,6 +18,7 @@ import (
 	"github.com/drycc/builder/pkg/sys"
 	"github.com/drycc/pkg/log"
 	corev1 "k8s.io/api/core/v1"
+
 	//"k8s.io/apimachinery/pkg/labels"
 	//"k8s.io/apimachinery/pkg/fields"
 	//"k8s.io/apimachinery/pkg/apis/meta/internalversion"
@@ -89,17 +90,7 @@ func dirHasGitSuffix(dir string) bool {
 
 func deleteFromObjectStore(app string, storageDriver storagedriver.StorageDriver) error {
 
-	cacheKey := fmt.Sprintf(gitreceive.CacheKeyPattern, app)
-
-	// if cache file exists, delete it
-	if _, err := storageDriver.Stat(context.Background(), cacheKey); err == nil {
-		log.Info("Cleaner deleting cache %s for app %s", cacheKey, app)
-		if err := storageDriver.Delete(context.Background(), cacheKey); err != nil {
-			return err
-		}
-	}
-
-	// delete all slug files matching app
+	// delete all files matching app
 	objs, err := storageDriver.List(context.Background(), "home")
 	if err != nil {
 		return err
@@ -113,7 +104,7 @@ func deleteFromObjectStore(app string, storageDriver storagedriver.StorageDriver
 
 	for _, obj := range objs {
 		if gitRegex.MatchString(obj) {
-			log.Info("Cleaner deleting slug %s for app %s", obj, app)
+			log.Info("Cleaner deleting %s for app %s", obj, app)
 			if err := storageDriver.Delete(context.Background(), obj); err != nil {
 				return err
 			}

pkg/gitreceive/build.go

@@ -30,6 +30,13 @@ import (
 	"k8s.io/client-go/kubernetes/scheme"
 )
 
+const (
+	// TarKeyPattern is the template for storing tar key files.
+	TarKeyPattern = "%s/tar"
+	// GitKeyPattern is the template for storing git key files.
+	GitKeyPattern = "home/%s:git-%s"
+)
+
 // repoCmd returns exec.Command(first, others...) with its current working directory repoDir
 func repoCmd(repoDir, first string, others ...string) *exec.Cmd {
 	cmd := exec.Command(first, others...)
@@ -62,16 +69,6 @@ func build(
 	// Rewrite regular expression, compatible with slug type
 	storagedriver.PathRegexp = regexp.MustCompile(`^([A-Za-z0-9._:-]*(/[A-Za-z0-9._:-]+)*)+$`)
 
-	imagebuilderImagePullPolicy, err := k8s.PullPolicyFromString(conf.ImagebuilderImagePullPolicy)
-	if err != nil {
-		return err
-	}
-
-	slugBuilderImagePullPolicy, err := k8s.PullPolicyFromString(conf.SlugBuilderImagePullPolicy)
-	if err != nil {
-		return err
-	}
-
 	repo := conf.Repository
 	gitSha, err := git.NewSha(rawGitSha)
 	if err != nil {
@@ -83,7 +80,6 @@ func build(
 	repoDir := filepath.Join(conf.GitHome, repo)
 	buildDir := filepath.Join(repoDir, "build")
 
-	slugName := fmt.Sprintf("%s:git-%s", appName, gitSha.Short())
 	if err := os.MkdirAll(buildDir, os.ModeDir); err != nil {
 		return fmt.Errorf("making the build directory %s (%s)", buildDir, err)
 	}
@@ -109,20 +105,6 @@ func build(
 		return err
 	}
 
-	_, disableCaching := appConf.Values["DRYCC_DISABLE_CACHE"]
-	slugBuilderInfo := NewSlugBuilderInfo(appName, gitSha.Short(), disableCaching)
-
-	if slugBuilderInfo.DisableCaching() {
-		log.Debug("caching disabled for app %s", appName)
-		// If cache file exists, delete it
-		if _, err := storageDriver.Stat(context.Background(), slugBuilderInfo.CacheKey()); err == nil {
-			log.Debug("deleting cache %s for app %s", slugBuilderInfo.CacheKey(), appName)
-			if err := storageDriver.Delete(context.Background(), slugBuilderInfo.CacheKey()); err != nil {
-				return err
-			}
-		}
-	}
-
 	// build a tarball from the new objects
 	appTgz := fmt.Sprintf("%s.tar.gz", appName)
 	gitArchiveCmd := repoCmd(repoDir, "git", "archive", "--format=tar.gz", fmt.Sprintf("--output=%s", appTgz), gitSha.Short())
@@ -148,83 +130,65 @@ func build(
 		return fmt.Errorf("error while reading file %s: (%s)", appTgz, err)
 	}
 
-	log.Debug("Uploading tar to %s", slugBuilderInfo.TarKey())
+	tarKey := fmt.Sprintf(TarKeyPattern, fmt.Sprintf(GitKeyPattern, appName, gitSha.Short()))
+	log.Debug("Uploading tar to %s", tarKey)
 
-	if err := storageDriver.PutContent(context.Background(), slugBuilderInfo.TarKey(), appTgzdata); err != nil {
-		return fmt.Errorf("uploading %s to %s (%v)", absAppTgz, slugBuilderInfo.TarKey(), err)
+	if err := storageDriver.PutContent(context.Background(), tarKey, appTgzdata); err != nil {
+		return fmt.Errorf("uploading %s to %s (%v)", absAppTgz, tarKey, err)
 	}
 
-	var pod *corev1.Pod
-	var buildPodName string
-	image := appName
-
 	builderPodNodeSelector, err := buildBuilderPodNodeSelector(conf.BuilderPodNodeSelector)
 	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") {
-		buildPodName = imagebuilderPodName(appName, gitSha.Short())
-		registryLocation := conf.RegistryLocation
-		registryEnv := make(map[string]string)
-		if registryLocation != "on-cluster" {
-			registryEnv, err = getRegistryDetails(kubeClient.CoreV1(), &image, registryLocation, conf.PodNamespace)
-			if err != nil {
-				return fmt.Errorf("error getting private registry details %s", err)
-			}
-			image = image + ":git-" + gitSha.Short()
-		}
-		registryEnv["DRYCC_REGISTRY_LOCATION"] = registryLocation
-
-		pod = imagebuilderPod(
-			conf.Debug,
-			buildPodName,
-			conf.PodNamespace,
-			appConf.Values,
-			slugBuilderInfo.TarKey(),
-			gitSha.Short(),
-			slugName,
-			conf.StorageType,
-			stack["image"],
-			conf.RegistryHost,
-			conf.RegistryPort,
-			registryEnv,
-			imagebuilderImagePullPolicy,
-			builderPodNodeSelector,
-		)
+		builderName = "drycc-imagebuilder"
+		imagePullPolicy, err = k8s.PullPolicyFromString(conf.ImagebuilderImagePullPolicy)
+		securityContext = k8s.SecurityContextFromPrivileged(false)
+
 	} else {
-		buildPodName = slugBuilderPodName(appName, gitSha.Short())
+		builderName = "drycc-buildpacker"
+		imagePullPolicy, err = k8s.PullPolicyFromString(conf.BuildpackerImagePullPolicy)
+		securityContext = k8s.SecurityContextFromPrivileged(true)
+	}
+	if err != nil {
+		return err
+	}
 
-		cacheKey := ""
-		if !slugBuilderInfo.DisableCaching() {
-			cacheKey = slugBuilderInfo.CacheKey()
-		}
-		envSecretName := fmt.Sprintf("%s-build-env", appName)
-		err = createAppEnvConfigSecret(kubeClient.CoreV1().Secrets(conf.PodNamespace), envSecretName, appConf.Values)
+	imageName := fmt.Sprintf("%s:git-%s", appName, gitSha.Short())
+	buildPodName := imagebuilderPodName(appName, gitSha.Short())
+	registryLocation := conf.RegistryLocation
+	registryEnv := make(map[string]string)
+	if registryLocation != "on-cluster" {
+		registryEnv, err = getRegistryDetails(kubeClient.CoreV1(), &imageName, registryLocation, conf.PodNamespace)
 		if err != nil {
-			return fmt.Errorf("error creating/updating secret %s: (%s)", envSecretName, err)
+			return fmt.Errorf("error getting private registry details %s", err)
 		}
-		defer func() {
-			if err := kubeClient.CoreV1().Secrets(conf.PodNamespace).Delete(ctx.TODO(), envSecretName, metav1.DeleteOptions{}); err != nil {
-				log.Info("unable to delete secret %s (%s)", envSecretName, err)
-			}
-		}()
-		pod = slugbuilderPod(
-			conf.Debug,
-			buildPodName,
-			conf.PodNamespace,
-			appConf.Values,
-			envSecretName,
-			slugBuilderInfo.TarKey(),
-			slugBuilderInfo.PushKey(),
-			cacheKey,
-			gitSha.Short(),
-			conf.StorageType,
-			stack["image"],
-			slugBuilderImagePullPolicy,
-			builderPodNodeSelector,
-		)
 	}
+	registryEnv["DRYCC_REGISTRY_LOCATION"] = registryLocation
+
+	pod := createBuilderPod(
+		conf.Debug,
+		buildPodName,
+		conf.PodNamespace,
+		appConf.Values,
+		tarKey,
+		gitSha.Short(),
+		imageName,
+		conf.StorageType,
+		builderName,
+		stack["image"],
+		conf.RegistryHost,
+		conf.RegistryPort,
+		registryEnv,
+		imagePullPolicy,
+		securityContext,
+		builderPodNodeSelector,
+	)
 
 	log.Info("Starting build... but first, coffee!")
 	log.Debug("Use image %s: %s", stack["name"], stack["image"])
@@ -296,7 +260,7 @@ func build(
 	}
 	log.Debug("Done")
 
-	procType, err := getProcFile(storageDriver, tmpDir, slugBuilderInfo.AbsoluteProcfileKey(), stack)
+	procType, err := getProcfile(storageDriver, tmpDir, stack)
 	if err != nil {
 		return err
 	}
@@ -305,10 +269,7 @@ func build(
 
 	quit := progress("...", conf.SessionIdleInterval())
 	log.Info("Launching App...")
-	if stack["name"] != "container" {
-		image = slugBuilderInfo.AbsoluteSlugObjectKey()
-	}
-	release, err := hooks.CreateBuild(client, conf.Username, conf.App(), image, stack["name"], gitSha.Short(), procType, stack["name"] == "container")
+	release, err := hooks.CreateBuild(client, conf.Username, conf.App(), imageName, stack["name"], gitSha.Short(), procType, stack["name"] == "container")
 	quit <- true
 	<-quit
 	if controller.CheckAPICompat(client, err) != nil {
@@ -350,8 +311,12 @@ func prettyPrintJSON(data interface{}) (string, error) {
 	return formatted.String(), nil
 }
 
-func getProcFile(getter storage.ObjectGetter, dirName, procfileKey string, stack map[string]string) (dryccAPI.ProcessType, error) {
+func getProcfile(getter storage.ObjectGetter, dirName string, stack map[string]string) (dryccAPI.ProcessType, error) {
 	procType := dryccAPI.ProcessType{}
+	_, err := os.Stat(fmt.Sprintf("%s/project.toml", dirName))
+	if err == nil || stack["name"] == "container" {
+		return procType, nil
+	}
 	if _, err := os.Stat(fmt.Sprintf("%s/Procfile", dirName)); err == nil {
 		rawProcFile, err := ioutil.ReadFile(fmt.Sprintf("%s/Procfile", dirName))
 		if err != nil {
@@ -362,16 +327,5 @@ func getProcFile(getter storage.ObjectGetter, dirName, procfileKey string, stack
 		}
 		return procType, nil
 	}
-	if stack["name"] == "container" {
-		return procType, nil
-	}
-	log.Debug("Procfile not present. Getting it from the buildpack")
-	rawProcFile, err := getter.GetContent(context.Background(), procfileKey)
-	if err != nil {
-		return nil, fmt.Errorf("error in reading %s (%s)", procfileKey, err)
-	}
-	if err := yaml.Unmarshal(rawProcFile, &procType); err != nil {
-		return nil, fmt.Errorf("procfile %s is malformed (%s)", procfileKey, err)
-	}
-	return procType, nil
+	return nil, fmt.Errorf("no Procfile can be matched in (%s)", dirName)
 }