ref(builder): remove yams template files

Author: aledbf

pkg/gitreceive/build.go

@@ -10,6 +10,7 @@ import (
 	"os/exec"
 	"path/filepath"
 	"strings"
+	"time"
 
 	"github.com/aws/aws-sdk-go/service/s3"
 	"github.com/deis/builder/pkg"
@@ -20,9 +21,6 @@ import (
 
 	"k8s.io/kubernetes/pkg/api"
 	client "k8s.io/kubernetes/pkg/client/unversioned"
-	"k8s.io/kubernetes/pkg/fields"
-	"k8s.io/kubernetes/pkg/labels"
-	"k8s.io/kubernetes/pkg/watch"
 )
 
 // repoCmd returns exec.Command(first, others...) with its current working directory repoDir
@@ -170,26 +168,15 @@ func build(conf *Config, s3Client *s3.S3, kubeClient *client.Client, builderKey,
 		return fmt.Errorf("creating builder pod (%s)", err)
 	}
 
-	watcher, err := podsInterface.Watch(labels.Nothing(), fields.OneTermEqualSelector("name", pod.Name), newPod.ResourceVersion)
-	if err != nil {
-		return fmt.Errorf("watching events for builder pod startup")
-	}
-
-	ch := watcher.ResultChan()
-	for evt := range ch {
-		if evt.Type == watch.Added {
-			watcher.Stop()
-			break
-		} else if evt.Type == watch.Error {
-			watcher.Stop()
-			return fmt.Errorf("builder pod failed to launch with ERROR")
-		}
+	timeout := time.Duration(5 * time.Minute)
+	tick := time.Duration(500 * time.Millisecond)
+	if err := waitForPod(kubeClient, newPod.Namespace, newPod.Name, tick, timeout); err != nil {
+		return fmt.Errorf("watching events for builder pod startup (%s)", err)
 	}
 
-	req := kubeClient.Get().Namespace(conf.PodNamespace).Name(newPod.Name).Resource("pods").SubResource("log").VersionedParams(
+	req := kubeClient.Get().Namespace(newPod.Namespace).Name(newPod.Name).Resource("pods").SubResource("log").VersionedParams(
 		&api.PodLogOptions{
-			Follow:   true,
-			Previous: true,
+			Follow: true,
 		}, api.Scheme)
 
 	rc, err := req.Stream()
@@ -198,10 +185,11 @@ func build(conf *Config, s3Client *s3.S3, kubeClient *client.Client, builderKey,
 	}
 	defer rc.Close()
 
-	_, err = io.Copy(os.Stdout, rc)
+	size, err := io.Copy(os.Stdout, rc)
 	if err != nil {
 		return fmt.Errorf("fetching builder logs (%s)", err)
 	}
+	log.Debug("size of logs streamed %v", size)
 
 	// poll the s3 server to ensure the slug exists
 	// TODO: time out looking

pkg/gitreceive/k8s_util.go

@@ -2,16 +2,27 @@ package gitreceive
 
 import (
 	"fmt"
-	"io/ioutil"
+	"time"
 
 	"github.com/pborman/uuid"
 	"k8s.io/kubernetes/pkg/api"
-	utilyaml "k8s.io/kubernetes/pkg/util/yaml"
+	apierrs "k8s.io/kubernetes/pkg/api/errors"
+	client "k8s.io/kubernetes/pkg/client/unversioned"
+	"k8s.io/kubernetes/pkg/util/wait"
 )
 
-var (
-	// yamlTempl path to deis yaml files (to allow override during tests)
-	yamlTempl = "/etc/deis-%v%v.yaml"
+const (
+	slugBuilderName    = "deis-slugbuilder"
+	slugBuilderImage   = "quay.io/deisci/slugbuilder:v2-beta"
+	dockerBuilderName  = "deis-dockerbuilder"
+	dockerBuilderImage = "quay.io/deisci/dockerbuilder:v2-beta"
+
+	tarURLKey        = "TAR_URL"
+	putURLKey        = "put_url"
+	debugKey         = "DEBUG"
+	minioUser        = "minio-user"
+	dockerSocketName = "docker-socket"
+	dockerSocketPath = "/var/run/docker.sock"
 )
 
 func dockerBuilderPodName(appName, shortSha string) string {
@@ -25,50 +36,92 @@ func slugBuilderPodName(appName, shortSha string) string {
 }
 
 func dockerBuilderPod(debug, withAuth bool, name, namespace string, env map[string]interface{}, tarURL, imageName string) *api.Pod {
-	pod := buildPod("dockerbuilder", withAuth, name, namespace, env)
-	return &pod
-}
+	pod := buildPod(debug, withAuth, name, namespace, env)
+
+	pod.Spec.Containers[0].Name = dockerBuilderName
+	pod.Spec.Containers[0].Image = dockerBuilderImage
+
+	addEnvToPod(pod, "ACCESS_KEY_FILE", "/var/run/secrets/object/store/access_key")
+	addEnvToPod(pod, "ACCESS_SECRET_FILE", "/var/run/secrets/object/store/access_secret")
+
+	if !withAuth {
+		addEnvToPod(pod, tarURLKey, tarURL)
+		addEnvToPod(pod, "IMG_NAME", imageName)
+	}
+
+	pod.Spec.Containers[0].VolumeMounts = append(pod.Spec.Containers[0].VolumeMounts, api.VolumeMount{
+		Name:      dockerSocketName,
+		MountPath: dockerSocketPath,
+	})
+
+	pod.Spec.Volumes = append(pod.Spec.Volumes, api.Volume{
+		Name: dockerSocketName,
+		VolumeSource: api.VolumeSource{
+			HostPath: &api.HostPathVolumeSource{
+				Path: dockerSocketPath,
+			},
+		},
+	})
 
-func slugbuilderPod(debug, withAuth bool, name, namespace string, env map[string]interface{}, tarURL, putURL, buildpackURL string) *api.Pod {
-	pod := buildPod("slugbuilder", withAuth, name, namespace, env)
 	return &pod
 }
 
-func buildPod(buildType string, withAuth bool, name, namespace string, env map[string]interface{}) api.Pod {
-	useCreds := "-no-creds"
-	if withAuth {
-		useCreds = ""
-	}
-	fileName := fmt.Sprintf(yamlTempl, buildType, useCreds)
+func slugbuilderPod(debug, withAuth bool, name, namespace string, env map[string]interface{}, tarURL, putURL, buildpackURL string) *api.Pod {
+	pod := buildPod(debug, withAuth, name, namespace, env)
 
-	pod := podFromFile(fileName)
+	pod.Spec.Containers[0].Name = slugBuilderName
+	pod.Spec.Containers[0].Image = slugBuilderImage
 
-	addEnvToPod(pod, env)
+	addEnvToPod(pod, tarURLKey, tarURL)
+	addEnvToPod(pod, putURLKey, putURL)
 
-	pod.ObjectMeta.Name = name
-	pod.ObjectMeta.Namespace = namespace
+	if buildpackURL != "" {
+		addEnvToPod(pod, "BUILDPACK_URL", buildpackURL)
+	}
 
-	return pod
+	return &pod
 }
 
-func podFromFile(fileName string) api.Pod {
-	var pod api.Pod
-	data, err := ioutil.ReadFile(fileName)
-	if err != nil {
-		fmt.Errorf("missing pod template %v (%v)", fileName, err)
+func buildPod(debug, withAuth bool, name, namespace string, env map[string]interface{}) api.Pod {
+	pod := api.Pod{
+		Spec: api.PodSpec{
+			RestartPolicy: api.RestartPolicyNever,
+			Containers: []api.Container{
+				api.Container{
+					ImagePullPolicy: api.PullAlways,
+				},
+			},
+			Volumes: []api.Volume{},
+		},
+		ObjectMeta: api.ObjectMeta{
+			Name:      name,
+			Namespace: namespace,
+			Labels: map[string]string{
+				"heritage": "deis",
+				"version":  "2.0.0-beta",
+			},
+		},
 	}
 
-	json, err := utilyaml.ToJSON(data)
-	if err != nil {
-		fmt.Errorf("invalid pod template %v (%v)", fileName, err)
+	if withAuth {
+		pod.Spec.Volumes = append(pod.Spec.Volumes, api.Volume{
+			Name: minioUser,
+			VolumeSource: api.VolumeSource{
+				Secret: &api.SecretVolumeSource{
+					SecretName: minioUser,
+				},
+			},
+		})
+
+		pod.Spec.Containers[0].VolumeMounts = []api.VolumeMount{
+			api.VolumeMount{
+				Name:      minioUser,
+				MountPath: "/var/run/secrets/object/store",
+				ReadOnly:  true,
+			},
+		}
 	}
 
-	api.Scheme.DecodeInto(json, &pod)
-
-	return pod
-}
-
-func addEnvToPod(pod api.Pod, env map[string]interface{}) {
 	if len(pod.Spec.Containers) > 0 {
 		for k, v := range env {
 			pod.Spec.Containers[0].Env = append(pod.Spec.Containers[0].Env, api.EnvVar{
@@ -77,4 +130,48 @@ func addEnvToPod(pod api.Pod, env map[string]interface{}) {
 			})
 		}
 	}
+
+	if debug {
+		addEnvToPod(pod, debugKey, "1")
+	}
+
+	return pod
+}
+
+func addEnvToPod(pod api.Pod, key, value string) {
+	if len(pod.Spec.Containers) > 0 {
+		pod.Spec.Containers[0].Env = append(pod.Spec.Containers[0].Env, api.EnvVar{
+			Name:  key,
+			Value: value,
+		})
+	}
+}
+
+// waitForPod waits for a pod in state running or failed
+func waitForPod(c *client.Client, ns, podName string, interval, timeout time.Duration) error {
+	return wait.PollImmediate(interval, timeout, func() (bool, error) {
+		pod, err := c.Pods(ns).Get(podName)
+		if err != nil {
+			if apierrs.IsNotFound(err) {
+				return true, err
+			}
+		}
+
+		condition := func(pod *api.Pod) (bool, error) {
+			if pod.Status.Phase == api.PodRunning {
+				return true, nil
+			}
+			if pod.Status.Phase == api.PodFailed {
+				return true, fmt.Errorf("Giving up; pod went into failed status: \n%s", fmt.Sprintf("%#v", pod))
+			}
+			return false, nil
+		}
+
+		done, err := condition(pod)
+		if done {
+			return true, nil
+		}
+
+		return false, nil
+	})
 }