add child NOTES.txt rendering

Signed-off-by: jgleonard <jgleonard@gmail.com>

pkg/tiller/release_install_test.go

@@ -291,8 +291,8 @@ func TestInstallRelease_WithChartAndDependencyNotes(t *testing.T) {
 
 	t.Logf("rel: %v", rel)
 
-	if rel.Info.Status.Notes != notesText {
+	if !strings.Contains(rel.Info.Status.Notes, notesText) || !strings.Contains(rel.Info.Status.Notes, notesText+" child") {
-		t.Fatalf("Expected '%s', got '%s'", notesText, rel.Info.Status.Notes)
+		t.Fatalf("Expected '%s', got '%s'", notesText+"\n"+notesText+" child", rel.Info.Status.Notes)
 	}
 
 	if rel.Info.Description != "Install complete" {

pkg/tiller/release_server.go

@@ -20,7 +20,6 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
-	"path"
 	"regexp"
 	"strings"
 
@@ -289,17 +288,18 @@ func (s *ReleaseServer) renderResources(ch *chart.Chart, values chartutil.Values
 	// text file. We have to spin through this map because the file contains path information, so we
 	// look for terminating NOTES.txt. We also remove it from the files so that we don't have to skip
 	// it in the sortHooks.
-	notes := ""
+	var notesBuffer bytes.Buffer
 	for k, v := range files {
 		if strings.HasSuffix(k, notesFileSuffix) {
-			// Only apply the notes if it belongs to the parent chart
+			// If buffer contains data, add newline before adding more
-			// Note: Do not use filePath.Join since it creates a path with \ which is not expected
+			if notesBuffer.Len() > 0 {
-			if k == path.Join(ch.Metadata.Name, "templates", notesFileSuffix) {
+				notesBuffer.WriteString("\n")
-				notes = v
 			}
+			notesBuffer.WriteString(v)
 			delete(files, k)
 		}
 	}
+	notes := notesBuffer.String()
 
 	// Sort hooks, manifests, and partials. Only hooks and manifests are returned,
 	// as partials are not used after renderer.Render. Empty manifests are also