TEST: add option to dump logs during helm test

Signed-off-by: Jeff Knurek <j.knurek@travelaudience.com>

_proto/hapi/services/tiller.proto

@@ -352,6 +352,8 @@ message TestReleaseRequest {
 	bool parallel = 4;
 	// maximum number of test pods to run in parallel
 	uint32 max_parallel = 5;
+	// logs specifies whether or not to dump the logs from the test pods
+	bool logs = 6;
 }
 
 // TestReleaseResponse represents a message from executing a test

cmd/helm/release_testing.go

@@ -41,6 +41,7 @@ type releaseTestCmd struct {
 	cleanup     bool
 	parallel    bool
 	maxParallel uint32
+	logs     bool
 }
 
 func newReleaseTestCmd(c helm.Interface, out io.Writer) *cobra.Command {
@@ -71,6 +72,7 @@ func newReleaseTestCmd(c helm.Interface, out io.Writer) *cobra.Command {
 	f.BoolVar(&rlsTest.cleanup, "cleanup", false, "Delete test pods upon completion")
 	f.BoolVar(&rlsTest.parallel, "parallel", false, "Run test pods in parallel")
 	f.Uint32Var(&rlsTest.maxParallel, "max", 20, "Maximum number of test pods to run in parallel")
+	f.BoolVar(&rlsTest.logs, "logs", false, "Dump the logs from test pods (this runs after all tests are complete, but before any cleanup")
 
 	// set defaults from environment
 	settings.InitTLS(f)
@@ -85,6 +87,7 @@ func (t *releaseTestCmd) run() (err error) {
 		helm.ReleaseTestCleanup(t.cleanup),
 		helm.ReleaseTestParallel(t.parallel),
 		helm.ReleaseTestMaxParallel(t.maxParallel),
+		helm.ReleaseTestLogs(t.logs),
 	)
 	testErr := &testErr{}
 

pkg/helm/option.go

@@ -241,6 +241,13 @@ func ReleaseTestMaxParallel(max uint32) ReleaseTestOption {
 	}
 }
 
+// ReleaseTestLogs is a boolean value representing whether to dump the logs from test pods
+func ReleaseTestLogs(logs bool) ReleaseTestOption {
+	return func(opts *options) {
+		opts.testReq.Logs = logs
+	}
+}
+
 // RollbackTimeout specifies the number of seconds before kubernetes calls timeout
 func RollbackTimeout(timeout int64) RollbackOption {
 	return func(opts *options) {

pkg/kube/client.go

@@ -947,6 +947,24 @@ func (c *Client) watchPodUntilComplete(timeout time.Duration, info *resource.Inf
 	return err
 }
 
+// GetPodLogs takes pod name and namespace and returns the current logs (streaming is NOT enabled).
+func (c *Client) GetPodLogs(name, ns string) (string, error) {
+	client, _ := c.KubernetesClientSet()
+	req := client.CoreV1().Pods(ns).GetLogs(name, &v1.PodLogOptions{})
+	podLogs, err := req.Stream()
+	if err != nil {
+		return "", fmt.Errorf("error in opening log stream, got: %s", err)
+	}
+	defer podLogs.Close()
+
+	buf := new(bytes.Buffer)
+	_, err = io.Copy(buf, podLogs)
+	if err != nil {
+		return "", fmt.Errorf("error in copy information from log stream to buf, got: %s", err)
+	}
+	return buf.String(), nil
+}
+
 func isPodComplete(event watch.Event) (bool, error) {
 	o, ok := event.Object.(*v1.Pod)
 	if !ok {

pkg/releasetesting/environment.go

@@ -96,7 +96,7 @@ func (env *Environment) streamError(info string) error {
 }
 
 func (env *Environment) streamFailed(name string) error {
-	msg := fmt.Sprintf("FAILED: %s, run `kubectl logs %s --namespace %s` for more info", name, name, env.Namespace)
+	msg := "FAILED: " + name
 	return env.streamMessage(msg, release.TestRun_FAILURE)
 }
 
@@ -126,3 +126,21 @@ func (env *Environment) DeleteTestPods(testManifests []string) {
 		}
 	}
 }
+
+func (env *Environment) GetLogs(testManifests []string) {
+	for _, testManifest := range testManifests {
+		infos, err := env.KubeClient.Build(env.Namespace, bytes.NewBufferString(testManifest))
+		if err != nil {
+			env.streamError(err.Error())
+			continue
+		}
+		podName := infos[0].Object.(*v1.Pod).Name
+		logs, err := env.KubeClient.GetPodLogs(podName, env.Namespace)
+		if err != nil {
+			env.streamError(err.Error())
+			continue
+		}
+		msg := fmt.Sprintf("\nPOD LOGS: %s\n%s", podName, logs)
+		env.streamMessage(msg, release.TestRun_UNKNOWN)
+	}
+}

pkg/tiller/environment/environment.go

@@ -175,6 +175,8 @@ type KubeClient interface {
 	// and returns said phase (PodSucceeded or PodFailed qualify).
 	WaitAndGetCompletedPodPhase(namespace string, reader io.Reader, timeout time.Duration) (v1.PodPhase, error)
 
+	GetPodLogs(name, namespace string) (string, error)
+
 	WaitUntilCRDEstablished(reader io.Reader, timeout time.Duration) error
 }
 
@@ -255,6 +257,11 @@ func (p *PrintingKubeClient) WaitAndGetCompletedPodPhase(namespace string, reade
 	return v1.PodUnknown, err
 }
 
+// GetPodLogs implements KubeClient GetPodLogs.
+func (p *PrintingKubeClient) GetPodLogs(name, ns string) (string, error) {
+	return "", nil
+}
+
 // WaitUntilCRDEstablished implements KubeClient WaitUntilCRDEstablished.
 func (p *PrintingKubeClient) WaitUntilCRDEstablished(reader io.Reader, timeout time.Duration) error {
 	_, err := io.Copy(p.Out, reader)

pkg/tiller/release_testing.go

@@ -69,6 +69,10 @@ func (s *ReleaseServer) RunReleaseTest(req *services.TestReleaseRequest, stream
 		Results:     tSuite.Results,
 	}
 
+	if req.Logs {
+		testEnv.GetLogs(tSuite.TestManifests)
+	}
+
 	if req.Cleanup {
 		testEnv.DeleteTestPods(tSuite.TestManifests)
 	}