feat(builder): add app config to env

Author: duanhongyi

pkg/gitreceive/build.go

@@ -101,15 +101,6 @@ func build(
 		return err
 	}
 
-	log.Debug("got the following config back for app %s: %+v", appName, appConf)
-	var buildPackURL string
-	if buildPackURLInterface, ok := appConf.Values["BUILDPACK_URL"]; ok {
-		if bpStr, ok := buildPackURLInterface.(string); ok {
-			log.Debug("found custom buildpack URL %s", bpStr)
-			buildPackURL = bpStr
-		}
-	}
-
 	_, disableCaching := appConf.Values["DRYCC_DISABLE_CACHE"]
 	slugBuilderInfo := NewSlugBuilderInfo(appName, gitSha.Short(), disableCaching)
 
@@ -214,12 +205,12 @@ func build(
 			conf.Debug,
 			buildPodName,
 			conf.PodNamespace,
+			appConf.Values,
 			envSecretName,
 			slugBuilderInfo.TarKey(),
 			slugBuilderInfo.PushKey(),
 			cacheKey,
 			gitSha.Short(),
-			buildPackURL,
 			conf.StorageType,
 			stack["image"],
 			slugBuilderImagePullPolicy,

pkg/gitreceive/k8s_util.go

@@ -103,12 +103,12 @@ func slugbuilderPod(
 	debug bool,
 	name,
 	namespace string,
+	env map[string]interface{},
 	envSecretName string,
 	tarKey,
 	putKey,
 	cacheKey,
 	gitShortHash string,
-	buildpackURL,
 	storageType,
 	image string,
 	pullPolicy api.PullPolicy,
@@ -145,10 +145,6 @@ func slugbuilderPod(
 	addEnvToPod(pod, sourceVersion, gitShortHash)
 	addEnvToPod(pod, builderStorage, storageType)
 
-	if buildpackURL != "" {
-		addEnvToPod(pod, "BUILDPACK_URL", buildpackURL)
-	}
-
 	return &pod
 }
 

pkg/gitreceive/k8s_util_test.go

@@ -46,12 +46,12 @@ type slugBuildCase struct {
 	debug                      bool
 	name                       string
 	namespace                  string
+	env                        map[string]interface{}
 	envSecretName              string
 	tarKey                     string
 	putKey                     string
 	cacheKey                   string
 	gitShortHash               string
-	buildPack                  string
 	slugBuilderImage           string
 	slugBuilderImagePullPolicy api.PullPolicy
 	storageType                string
@@ -77,6 +77,7 @@ func TestBuildPod(t *testing.T) {
 
 	env := make(map[string]interface{})
 	env["KEY"] = "VALUE"
+	env["BUILDPACK_URL"] = "buildpack"
 	buildArgsEnv := make(map[string]interface{})
 	buildArgsEnv["DRYCC_DOCKER_BUILD_ARGS_ENABLED"] = "1"
 	buildArgsEnv["KEY"] = "VALUE"
@@ -93,27 +94,27 @@ func TestBuildPod(t *testing.T) {
 	nodeSelector2["network"] = "fast"
 
 	slugBuilds := []slugBuildCase{
-		{true, "test", "default", envSecretName, "tar", "put-url", "cache-url", "deadbeef", "", "", api.PullAlways, "", emptyNodeSelector},
-		{true, "test", "default", envSecretName, "tar", "put-url", "cache-url", "deadbeef", "", "", api.PullAlways, "", emptyNodeSelector},
-		{true, "test", "default", envSecretName, "tar", "put-url", "", "deadbeef", "", "", api.PullAlways, "", emptyNodeSelector},
-		{true, "test", "default", envSecretName, "tar", "put-url", "cache-url", "deadbeef", "buildpack", "", api.PullAlways, "", emptyNodeSelector},
-		{true, "test", "default", envSecretName, "tar", "put-url", "cache-url", "deadbeef", "buildpack", "", api.PullAlways, "", emptyNodeSelector},
-		{true, "test", "default", envSecretName, "tar", "put-url", "cache-url", "deadbeef", "buildpack", "customimage", api.PullAlways, "", nil},
-		{true, "test", "default", envSecretName, "tar", "put-url", "cache-url", "deadbeef", "buildpack", "customimage", api.PullIfNotPresent, "", nodeSelector1},
-		{true, "test", "default", envSecretName, "tar", "put-url", "cache-url", "deadbeef", "buildpack", "customimage", api.PullNever, "", nodeSelector2},
+		{true, "test", "default", emptyEnv, envSecretName, "tar", "put-url", "cache-url", "deadbeef", "", api.PullAlways, "", emptyNodeSelector},
+		{true, "test", "default", emptyEnv, envSecretName, "tar", "put-url", "cache-url", "deadbeef", "", api.PullAlways, "", emptyNodeSelector},
+		{true, "test", "default", emptyEnv, envSecretName, "tar", "put-url", "", "deadbeef", "", api.PullAlways, "", emptyNodeSelector},
+		{true, "test", "default", env, envSecretName, "tar", "put-url", "cache-url", "deadbeef", "", api.PullAlways, "", emptyNodeSelector},
+		{true, "test", "default", env, envSecretName, "tar", "put-url", "cache-url", "deadbeef", "", api.PullAlways, "", emptyNodeSelector},
+		{true, "test", "default", env, envSecretName, "tar", "put-url", "cache-url", "deadbeef", "customimage", api.PullAlways, "", nil},
+		{true, "test", "default", env, envSecretName, "tar", "put-url", "cache-url", "deadbeef", "customimage", api.PullIfNotPresent, "", nodeSelector1},
+		{true, "test", "default", env, envSecretName, "tar", "put-url", "cache-url", "deadbeef", "customimage", api.PullNever, "", nodeSelector2},
 	}
 
 	for _, build := range slugBuilds {
 		pod = slugbuilderPod(
 			build.debug,
 			build.name,
 			build.namespace,
+			build.env,
 			build.envSecretName,
 			build.tarKey,
 			build.putKey,
 			build.cacheKey,
 			build.gitShortHash,
-			build.buildPack,
 			build.storageType,
 			build.slugBuilderImage,
 			build.slugBuilderImagePullPolicy,
@@ -140,10 +141,6 @@ func TestBuildPod(t *testing.T) {
 			checkForEnv(t, pod, "CACHE_PATH", build.cacheKey)
 		}
 
-		if build.buildPack != "" {
-			checkForEnv(t, pod, "BUILDPACK_URL", build.buildPack)
-		}
-
 		if build.slugBuilderImage != "" {
 			if pod.Spec.Containers[0].Image != build.slugBuilderImage {
 				t.Errorf("expected %v but returned %v ", build.slugBuilderImage, pod.Spec.Containers[0].Image)