chore(builder): use imagebuilder replace dockerbuilder

Author: duanhongyi

README.md

@@ -23,7 +23,7 @@ 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 [`dockerbuilder`](https://github.com/drycc/dockerbuilder) pod, configured to download the code to build from the URL computed in the previous step.
+  - 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.
 
 # Supported Off-Cluster Storage Backends

charts/builder/templates/builder-deployment.yaml

@@ -63,10 +63,10 @@ spec:
                 configMapKeyRef:
                   name: slugbuilder-config
                   key: image_pull_policy
-            - name: DOCKERBUILDER_IMAGE_PULL_POLICY
+            - name: IMAGEBUILDER_IMAGE_PULL_POLICY
               valueFrom:
                 configMapKeyRef:
-                  name: dockerbuilder-config
+                  name: imagebuilder-config
                   key: image_pull_policy
             # This var needs to be passed so that the minio client (https://github.com/minio/mc) will work in Alpine linux
             - name: "DOCKERIMAGE"
@@ -111,8 +111,8 @@ spec:
             - name: slugbuilder-config
               mountPath: /etc/slugbuilder
               readOnly: true
-            - name: dockerbuilder-config
-              mountPath: /etc/dockerbuilder
+            - name: imagebuilder-config
+              mountPath: /etc/imagebuilder
               readOnly: true
       volumes:
         - name: builder-key-auth
@@ -127,6 +127,6 @@ spec:
         - name: slugbuilder-config
           configMap:
             name: slugbuilder-config
-        - name: dockerbuilder-config
+        - name: imagebuilder-config
           configMap:
-            name: dockerbuilder-config
+            name: imagebuilder-config

pkg/gitreceive/build.go

@@ -62,7 +62,7 @@ func build(
 	// Rewrite regular expression, compatible with slug type
 	storagedriver.PathRegexp = regexp.MustCompile(`^([A-Za-z0-9._:-]*(/[A-Za-z0-9._:-]+)*)+$`)
 
-	dockerBuilderImagePullPolicy, err := k8s.PullPolicyFromString(conf.DockerBuilderImagePullPolicy)
+	imagebuilderImagePullPolicy, err := k8s.PullPolicyFromString(conf.ImagebuilderImagePullPolicy)
 	if err != nil {
 		return err
 	}
@@ -164,7 +164,7 @@ func build(
 	}
 
 	if strings.Contains(stack["name"], "container") {
-		buildPodName = dockerBuilderPodName(appName, gitSha.Short())
+		buildPodName = imagebuilderPodName(appName, gitSha.Short())
 		registryLocation := conf.RegistryLocation
 		registryEnv := make(map[string]string)
 		if registryLocation != "on-cluster" {
@@ -176,7 +176,7 @@ func build(
 		}
 		registryEnv["DRYCC_REGISTRY_LOCATION"] = registryLocation
 
-		pod = dockerBuilderPod(
+		pod = imagebuilderPod(
 			conf.Debug,
 			buildPodName,
 			conf.PodNamespace,
@@ -189,7 +189,7 @@ func build(
 			conf.RegistryHost,
 			conf.RegistryPort,
 			registryEnv,
-			dockerBuilderImagePullPolicy,
+			imagebuilderImagePullPolicy,
 			builderPodNodeSelector,
 		)
 	} else {

pkg/gitreceive/build_test.go

@@ -61,10 +61,10 @@ func TestBuild(t *testing.T) {
 	}
 
 	if err := build(config, storageDriver, nil, fs, env, "foo", sha); err == nil {
-		t.Error("expected running build() without setting config.DockerBuilderImagePullPolicy to fail")
+		t.Error("expected running build() without setting config.ImagebuilderImagePullPolicy to fail")
 	}
 
-	config.DockerBuilderImagePullPolicy = "Always"
+	config.ImagebuilderImagePullPolicy = "Always"
 	if err := build(config, storageDriver, nil, fs, env, "foo", sha); err == nil {
 		t.Error("expected running build() without setting config.SlugBuilderImagePullPolicy to fail")
 	}

pkg/gitreceive/build_type.go

@@ -37,13 +37,13 @@ func initStack() error {
 		var stacksSlugbuilder []map[string]string
 		err = json.Unmarshal(data, &stacksSlugbuilder)
 		if err == nil {
-			data, err = ioutil.ReadFile("/etc/dockerbuilder/images.json")
+			data, err = ioutil.ReadFile("/etc/imagebuilder/images.json")
 			if err == nil {
-				var stacksDockerbuilder []map[string]string
-				err = json.Unmarshal(data, &stacksDockerbuilder)
+				var stacksImagebuilder []map[string]string
+				err = json.Unmarshal(data, &stacksImagebuilder)
 				if err == nil {
 					// Stacks order represents priority
-					Stacks = stacksDockerbuilder
+					Stacks = stacksImagebuilder
 					Stacks = append(Stacks, stacksSlugbuilder...)
 				}
 				return nil

pkg/gitreceive/config.go

@@ -35,7 +35,7 @@ type Config struct {
 	ObjectStorageWaitDurationMSec int    `envconfig:"OBJECT_STORAGE_WAIT_DURATION" default:"300000"` // 5 minutes
 	SessionIdleIntervalMsec       int    `envconfig:"SESSION_IDLE_INTERVAL" default:"10000"`         // 10 seconds
 	SlugBuilderImagePullPolicy    string `envconfig:"SLUGBUILDER_IMAGE_PULL_POLICY" default:"Always"`
-	DockerBuilderImagePullPolicy  string `envconfig:"DOCKERBUILDER_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

@@ -18,7 +18,7 @@ import (
 
 const (
 	slugBuilderName   = "drycc-slugbuilder"
-	dockerBuilderName = "drycc-dockerbuilder"
+	imagebuilderName = "drycc-imagebuilder"
 
 	tarPath         = "TAR_PATH"
 	putPath         = "PUT_PATH"
@@ -31,14 +31,14 @@ const (
 	envRoot         = "/tmp/env"
 )
 
-func dockerBuilderPodName(appName, shortSha string) string {
+func imagebuilderPodName(appName, shortSha string) string {
 	uid := uuid.New()[:8]
 	// NOTE(bacongobbler): pod names cannot exceed 63 characters in length, so we truncate
 	// the application name to stay under that limit when adding all the extra metadata to the name
 	if len(appName) > 33 {
 		appName = appName[:33]
 	}
-	return fmt.Sprintf("dockerbuild-%s-%s-%s", appName, shortSha, uid)
+	return fmt.Sprintf("imagebuild-%s-%s-%s", appName, shortSha, uid)
 }
 
 func slugBuilderPodName(appName, shortSha string) string {
@@ -51,7 +51,7 @@ func slugBuilderPodName(appName, shortSha string) string {
 	return fmt.Sprintf("slugbuild-%s-%s-%s", appName, shortSha, uid)
 }
 
-func dockerBuilderPod(
+func imagebuilderPod(
 	debug bool,
 	name,
 	namespace string,
@@ -71,27 +71,27 @@ func dockerBuilderPod(
 
 	pod := buildPod(debug, name, namespace, pullPolicy, nodeSelector, env)
 
-	// inject application envvars as a special envvar which will be handled by dockerbuilder to
+	// inject application envvars as a special envvar which will be handled by imagebuilder to
 	// inject them as build-time variables.
-	// NOTE(bacongobbler): docker-py takes buildargs as a json string in the form of
+	// NOTE(bacongobbler): image-py takes buildargs as a json string in the form of
 	//
 	// {"KEY": "value"}
 	//
 	// So we need to translate the map into json.
 	if _, ok := env["DRYCC_DOCKER_BUILD_ARGS_ENABLED"]; ok {
-		dockerBuildArgs, _ := json.Marshal(env)
-		addEnvToPod(pod, "DOCKER_BUILD_ARGS", string(dockerBuildArgs))
+		imageBuildArgs, _ := json.Marshal(env)
+		addEnvToPod(pod, "DOCKER_BUILD_ARGS", string(imageBuildArgs))
 	}
 
-	pod.Spec.Containers[0].Name = dockerBuilderName
+	pod.Spec.Containers[0].Name = imagebuilderName
 	pod.Spec.Containers[0].Image = image
 
 	addEnvToPod(pod, tarPath, tarKey)
 	addEnvToPod(pod, sourceVersion, gitShortHash)
 	addEnvToPod(pod, "IMG_NAME", imageName)
 	addEnvToPod(pod, builderStorage, storageType)
-	// inject existing DRYCC_REGISTRY_PROXY_HOST and PORT info to dockerbuilder
-	// see https://github.com/drycc/dockerbuilder/issues/83
+	// inject existing DRYCC_REGISTRY_PROXY_HOST and PORT info to imagebuilder
+	// see https://github.com/drycc/imagebuilder/issues/83
 	addEnvToPod(pod, "DRYCC_REGISTRY_PROXY_HOST", registryHost)
 	addEnvToPod(pod, "DRYCC_REGISTRY_PROXY_PORT", registryPort)
 

pkg/gitreceive/k8s_util_test.go

@@ -12,18 +12,18 @@ import (
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 )
 
-func TestDockerBuilderPodName(t *testing.T) {
-	name := dockerBuilderPodName("demo", "12345678")
-	if !strings.HasPrefix(name, "dockerbuild-demo-12345678-") {
-		t.Errorf("expected pod name dockerbuild-demo-12345678-*, got %s", name)
+func TestImagebuilderPodName(t *testing.T) {
+	name := imagebuilderPodName("demo", "12345678")
+	if !strings.HasPrefix(name, "imagebuild-demo-12345678-") {
+		t.Errorf("expected pod name imagebuild-demo-12345678-*, got %s", name)
 	}
 
-	name = dockerBuilderPodName("this-name-has-more-than-24-characters-in-length", "12345678")
-	if !strings.HasPrefix(name, "dockerbuild-this-name-has-more-than-24-charac-12345678-") {
-		t.Errorf("expected pod name dockerbuild-this-name-has-more-than-24-charac-12345678-*, got %s", name)
+	name = imagebuilderPodName("this-name-has-more-than-24-characters-in-length", "12345678")
+	if !strings.HasPrefix(name, "imagebuild-this-name-has-more-than-24-charac-12345678-") {
+		t.Errorf("expected pod name imagebuild-this-name-has-more-than-24-charac-12345678-*, got %s", name)
 	}
 	if len(name) > 63 {
-		t.Errorf("expected dockerbuilder pod name length to be <= 63 characters in length, got %d", len(name))
+		t.Errorf("expected imagebuilder pod name length to be <= 63 characters in length, got %d", len(name))
 	}
 }
 
@@ -58,16 +58,16 @@ type slugBuildCase struct {
 	builderPodNodeSelector     map[string]string
 }
 
-type dockerBuildCase struct {
+type imageBuildCase struct {
 	debug                        bool
 	name                         string
 	namespace                    string
 	env                          map[string]interface{}
 	tarKey                       string
 	gitShortHash                 string
 	imgName                      string
-	dockerBuilderImage           string
-	dockerBuilderImagePullPolicy corev1.PullPolicy
+	imagebuilderImage           string
+	imagebuilderImagePullPolicy corev1.PullPolicy
 	storageType                  string
 	builderPodNodeSelector       map[string]string
 }
@@ -157,7 +157,7 @@ func TestBuildPod(t *testing.T) {
 		}
 	}
 
-	dockerBuilds := []dockerBuildCase{
+	imageBuilds := []imageBuildCase{
 		{true, "test", "default", emptyEnv, "tar", "deadbeef", "", "", corev1.PullAlways, "", nodeSelector1},
 		{true, "test", "default", env, "tar", "deadbeef", "", "", corev1.PullAlways, "", nodeSelector2},
 		{true, "test", "default", emptyEnv, "tar", "deadbeef", "img", "", corev1.PullAlways, "", emptyNodeSelector},
@@ -168,8 +168,8 @@ func TestBuildPod(t *testing.T) {
 		{true, "test", "default", buildArgsEnv, "tar", "deadbeef", "img", "customimage", corev1.PullIfNotPresent, "", emptyNodeSelector},
 	}
 	regEnv := map[string]string{"REG_LOC": "on-cluster"}
-	for _, build := range dockerBuilds {
-		pod = dockerBuilderPod(
+	for _, build := range imageBuilds {
+		pod = imagebuilderPod(
 			build.debug,
 			build.name,
 			build.namespace,
@@ -178,11 +178,11 @@ func TestBuildPod(t *testing.T) {
 			build.gitShortHash,
 			build.imgName,
 			build.storageType,
-			build.dockerBuilderImage,
+			build.imagebuilderImage,
 			"localhost",
 			"5555",
 			regEnv,
-			build.dockerBuilderImagePullPolicy,
+			build.imagebuilderImagePullPolicy,
 			build.builderPodNodeSelector,
 		)
 
@@ -200,15 +200,15 @@ func TestBuildPod(t *testing.T) {
 		if _, ok := build.env["DRYCC_DOCKER_BUILD_ARGS_ENABLED"]; ok {
 			checkForEnv(t, pod, "DOCKER_BUILD_ARGS", `{"DRYCC_DOCKER_BUILD_ARGS_ENABLED":"1","KEY":"VALUE"}`)
 		}
-		if build.dockerBuilderImage != "" {
-			if pod.Spec.Containers[0].Image != build.dockerBuilderImage {
-				t.Errorf("expected %v but returned %v", build.dockerBuilderImage, pod.Spec.Containers[0].Image)
+		if build.imagebuilderImage != "" {
+			if pod.Spec.Containers[0].Image != build.imagebuilderImage {
+				t.Errorf("expected %v but returned %v", build.imagebuilderImage, pod.Spec.Containers[0].Image)
 			}
 		}
-		if build.dockerBuilderImagePullPolicy != "" {
+		if build.imagebuilderImagePullPolicy != "" {
 			if pod.Spec.Containers[0].ImagePullPolicy != "" {
-				if pod.Spec.Containers[0].ImagePullPolicy != build.dockerBuilderImagePullPolicy {
-					t.Errorf("expected %v but returned %v", build.dockerBuilderImagePullPolicy, pod.Spec.Containers[0].ImagePullPolicy)
+				if pod.Spec.Containers[0].ImagePullPolicy != build.imagebuilderImagePullPolicy {
+					t.Errorf("expected %v but returned %v", build.imagebuilderImagePullPolicy, pod.Spec.Containers[0].ImagePullPolicy)
 				}
 			}
 		}

pkg/sshd/config.go

@@ -15,7 +15,7 @@ type Config struct {
 	CleanerPollSleepDurationSec  int    `envconfig:"CLEANER_POLL_SLEEP_DURATION_SEC" default:"5"`
 	StorageType                  string `envconfig:"BUILDER_STORAGE" default:"minio"`
 	SlugBuilderImagePullPolicy   string `envconfig:"SLUGBUILDER_IMAGE_PULL_POLICY" default:"Always"`
-	DockerBuilderImagePullPolicy string `envconfig:"DOCKERBUILDER_IMAGE_PULL_POLICY" default:"Always"`
+	ImagebuilderImagePullPolicy string `envconfig:"IMAGEBUILDER_IMAGE_PULL_POLICY" default:"Always"`
 	LockTimeout                  int    `envconfig:"GIT_LOCK_TIMEOUT" default:"10"`
 }