bring back to par with master

dm/dm.go

@@ -214,6 +214,7 @@ func execute() {
 			// Type is most likely a primitive.
 			tUrl = args[1]
 		} else {
+			// TODO(vaikas): Support packages properly.
 			tUrl = tUrls[0]
 		}
 		path := fmt.Sprintf("types/%s/instances", url.QueryEscape(tUrl))

examples/package/package.yaml

@@ -1,4 +0,0 @@
-resources:
-- name: cassandra
-  type: github.com/helm/charts/cassandra
-  properties: null

manager/manager/expander.go

@@ -21,7 +21,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
-	"log"
 	"net/http"
 
 	"github.com/ghodss/yaml"
@@ -141,8 +140,6 @@ func (e *expander) ExpandTemplate(t *common.Template) (*ExpandedTemplate, error)
 
 	t.Imports = append(t.Imports, newImp...)
 
-	log.Printf("Got Imports as %#v", t.Imports)
-
 	for {
 		// Now expand with everything imported.
 		result, err := e.expandTemplate(t)
@@ -169,7 +166,6 @@ func (e *expander) ExpandTemplate(t *common.Template) (*ExpandedTemplate, error)
 		// If the new imports contain nothing, we are done. Everything is fully expanded.
 		if len(newImp) == 0 {
 			result.Layout = finalLayout
-			log.Printf("Returning config as %#v", result)
 			return result, nil
 		}