From b74fee715ee1d660be8fea8bf35942fc447a6a7e Mon Sep 17 00:00:00 2001
From: Martin Hickey <martin.hickey@ie.ibm.com>
Date: Wed, 13 Mar 2019 11:44:41 +0000
Subject: [PATCH] Add capability for application charts to be used as library
 charts

Signed-off-by: Martin Hickey <martin.hickey@ie.ibm.com>
---
 cmd/helm/template_test.go                     |  10 +
 ...te-chart-with-template-lib-archive-dep.txt |  62 ++
 .../template-chart-with-template-lib-dep.txt  |  62 ++
 .../.helmignore                               |  21 +
 .../Chart.yaml                                |   6 +
 .../charts/common-0.0.5.tgz                   | Bin 0 -> 8446 bytes
 .../templates/NOTES.txt                       |  19 +
 .../templates/_helpers.tpl                    |  32 +
 .../templates/deployment.yaml                 |  51 ++
 .../templates/ingress.yaml                    |  38 +
 .../templates/service.yaml                    |  10 +
 .../values.yaml                               |  48 +
 .../chart-with-template-lib-dep/.helmignore   |  21 +
 .../chart-with-template-lib-dep/Chart.yaml    |   6 +
 .../charts/common/.helmignore                 |  21 +
 .../charts/common/Chart.yaml                  |  12 +
 .../charts/common/README.md                   | 831 ++++++++++++++++++
 .../charts/common/templates/_chartref.tpl     |  14 +
 .../charts/common/templates/_configmap.yaml   |   9 +
 .../charts/common/templates/_container.yaml   |  15 +
 .../charts/common/templates/_deployment.yaml  |  18 +
 .../charts/common/templates/_envvar.tpl       |  31 +
 .../charts/common/templates/_fullname.tpl     |  39 +
 .../charts/common/templates/_ingress.yaml     |  27 +
 .../charts/common/templates/_metadata.yaml    |  10 +
 .../templates/_metadata_annotations.tpl       |  18 +
 .../common/templates/_metadata_labels.tpl     |  28 +
 .../charts/common/templates/_name.tpl         |  29 +
 .../templates/_persistentvolumeclaim.yaml     |  24 +
 .../charts/common/templates/_secret.yaml      |  10 +
 .../charts/common/templates/_service.yaml     |  17 +
 .../charts/common/templates/_util.tpl         |  15 +
 .../charts/common/templates/_volume.tpl       |  22 +
 .../charts/common/templates/configmap.yaml    |   6 +
 .../charts/common/values.yaml                 |   4 +
 .../templates/NOTES.txt                       |  19 +
 .../templates/_helpers.tpl                    |  32 +
 .../templates/deployment.yaml                 |  51 ++
 .../templates/ingress.yaml                    |  38 +
 .../templates/service.yaml                    |  10 +
 .../chart-with-template-lib-dep/values.yaml   |  48 +
 docs/charts.md                                |   4 +
 pkg/chart/loader/archive.go                   |  43 +-
 pkg/chart/loader/load.go                      |  57 +-
 pkg/registry/cache.go                         |   2 +-
 45 files changed, 1883 insertions(+), 7 deletions(-)
 create mode 100644 cmd/helm/testdata/output/template-chart-with-template-lib-archive-dep.txt
 create mode 100644 cmd/helm/testdata/output/template-chart-with-template-lib-dep.txt
 create mode 100644 cmd/helm/testdata/testcharts/chart-with-template-lib-archive-dep/.helmignore
 create mode 100644 cmd/helm/testdata/testcharts/chart-with-template-lib-archive-dep/Chart.yaml
 create mode 100644 cmd/helm/testdata/testcharts/chart-with-template-lib-archive-dep/charts/common-0.0.5.tgz
 create mode 100644 cmd/helm/testdata/testcharts/chart-with-template-lib-archive-dep/templates/NOTES.txt
 create mode 100644 cmd/helm/testdata/testcharts/chart-with-template-lib-archive-dep/templates/_helpers.tpl
 create mode 100644 cmd/helm/testdata/testcharts/chart-with-template-lib-archive-dep/templates/deployment.yaml
 create mode 100644 cmd/helm/testdata/testcharts/chart-with-template-lib-archive-dep/templates/ingress.yaml
 create mode 100644 cmd/helm/testdata/testcharts/chart-with-template-lib-archive-dep/templates/service.yaml
 create mode 100644 cmd/helm/testdata/testcharts/chart-with-template-lib-archive-dep/values.yaml
 create mode 100644 cmd/helm/testdata/testcharts/chart-with-template-lib-dep/.helmignore
 create mode 100644 cmd/helm/testdata/testcharts/chart-with-template-lib-dep/Chart.yaml
 create mode 100755 cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/.helmignore
 create mode 100755 cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/Chart.yaml
 create mode 100755 cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/README.md
 create mode 100755 cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/templates/_chartref.tpl
 create mode 100755 cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/templates/_configmap.yaml
 create mode 100755 cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/templates/_container.yaml
 create mode 100755 cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/templates/_deployment.yaml
 create mode 100755 cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/templates/_envvar.tpl
 create mode 100755 cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/templates/_fullname.tpl
 create mode 100755 cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/templates/_ingress.yaml
 create mode 100755 cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/templates/_metadata.yaml
 create mode 100755 cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/templates/_metadata_annotations.tpl
 create mode 100755 cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/templates/_metadata_labels.tpl
 create mode 100755 cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/templates/_name.tpl
 create mode 100755 cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/templates/_persistentvolumeclaim.yaml
 create mode 100755 cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/templates/_secret.yaml
 create mode 100755 cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/templates/_service.yaml
 create mode 100755 cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/templates/_util.tpl
 create mode 100755 cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/templates/_volume.tpl
 create mode 100644 cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/templates/configmap.yaml
 create mode 100755 cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/values.yaml
 create mode 100644 cmd/helm/testdata/testcharts/chart-with-template-lib-dep/templates/NOTES.txt
 create mode 100644 cmd/helm/testdata/testcharts/chart-with-template-lib-dep/templates/_helpers.tpl
 create mode 100644 cmd/helm/testdata/testcharts/chart-with-template-lib-dep/templates/deployment.yaml
 create mode 100644 cmd/helm/testdata/testcharts/chart-with-template-lib-dep/templates/ingress.yaml
 create mode 100644 cmd/helm/testdata/testcharts/chart-with-template-lib-dep/templates/service.yaml
 create mode 100644 cmd/helm/testdata/testcharts/chart-with-template-lib-dep/values.yaml

diff --git a/cmd/helm/template_test.go b/cmd/helm/template_test.go
index 65586c394..d4131acd3 100644
--- a/cmd/helm/template_test.go
+++ b/cmd/helm/template_test.go
@@ -64,6 +64,16 @@ func TestTemplateCmd(t *testing.T) {
 			wantError: true,
 			golden:    "output/install-chart-bad-type.txt",
 		},
+		{
+			name:   "check chart with dependency which is an app chart acting as a library chart",
+			cmd:    fmt.Sprintf("template '%s'", "testdata/testcharts/chart-with-template-lib-dep"),
+			golden: "output/template-chart-with-template-lib-dep.txt",
+		},
+		{
+			name:   "check chart with dependency which is an app chart archive acting as a library chart",
+			cmd:    fmt.Sprintf("template '%s'", "testdata/testcharts/chart-with-template-lib-archive-dep"),
+			golden: "output/template-chart-with-template-lib-archive-dep.txt",
+		},
 	}
 	runTestCmd(t, tests)
 }
diff --git a/cmd/helm/testdata/output/template-chart-with-template-lib-archive-dep.txt b/cmd/helm/testdata/output/template-chart-with-template-lib-archive-dep.txt
new file mode 100644
index 000000000..d92f71308
--- /dev/null
+++ b/cmd/helm/testdata/output/template-chart-with-template-lib-archive-dep.txt
@@ -0,0 +1,62 @@
+---
+# Source: chart-with-template-lib-archive-dep/templates/service.yaml
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app: chart-with-template-lib-archive-dep
+    chart: chart-with-template-lib-archive-dep-0.1.0
+    heritage: Helm
+    release: RELEASE-NAME
+  name: release-name-chart-with-template-lib-archive-dep
+spec:
+  ports:
+  - name: http
+    port: 80
+    targetPort: http
+  selector:
+    app: chart-with-template-lib-archive-dep
+    release: RELEASE-NAME
+  type: ClusterIP
+---
+# Source: chart-with-template-lib-archive-dep/templates/deployment.yaml
+apiVersion: apps/v1beta2
+kind: Deployment
+metadata:
+  name: RELEASE-NAME-chart-with-template-lib-archive-dep
+  labels:
+    app: chart-with-template-lib-archive-dep
+    chart: chart-with-template-lib-archive-dep-0.1.0
+    release: RELEASE-NAME
+    heritage: Helm
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: chart-with-template-lib-archive-dep
+      release: RELEASE-NAME
+  template:
+    metadata:
+      labels:
+        app: chart-with-template-lib-archive-dep
+        release: RELEASE-NAME
+    spec:
+      containers:
+        - name: chart-with-template-lib-archive-dep
+          image: "nginx:stable"
+          imagePullPolicy: IfNotPresent
+          ports:
+            - name: http
+              containerPort: 80
+              protocol: TCP
+          livenessProbe:
+            httpGet:
+              path: /
+              port: http
+          readinessProbe:
+            httpGet:
+              path: /
+              port: http
+          resources:
+            {}
+
diff --git a/cmd/helm/testdata/output/template-chart-with-template-lib-dep.txt b/cmd/helm/testdata/output/template-chart-with-template-lib-dep.txt
new file mode 100644
index 000000000..64a6b305d
--- /dev/null
+++ b/cmd/helm/testdata/output/template-chart-with-template-lib-dep.txt
@@ -0,0 +1,62 @@
+---
+# Source: chart-with-template-lib-dep/templates/service.yaml
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app: chart-with-template-lib-dep
+    chart: chart-with-template-lib-dep-0.1.0
+    heritage: Helm
+    release: RELEASE-NAME
+  name: release-name-chart-with-template-lib-dep
+spec:
+  ports:
+  - name: http
+    port: 80
+    targetPort: http
+  selector:
+    app: chart-with-template-lib-dep
+    release: RELEASE-NAME
+  type: ClusterIP
+---
+# Source: chart-with-template-lib-dep/templates/deployment.yaml
+apiVersion: apps/v1beta2
+kind: Deployment
+metadata:
+  name: RELEASE-NAME-chart-with-template-lib-dep
+  labels:
+    app: chart-with-template-lib-dep
+    chart: chart-with-template-lib-dep-0.1.0
+    release: RELEASE-NAME
+    heritage: Helm
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: chart-with-template-lib-dep
+      release: RELEASE-NAME
+  template:
+    metadata:
+      labels:
+        app: chart-with-template-lib-dep
+        release: RELEASE-NAME
+    spec:
+      containers:
+        - name: chart-with-template-lib-dep
+          image: "nginx:stable"
+          imagePullPolicy: IfNotPresent
+          ports:
+            - name: http
+              containerPort: 80
+              protocol: TCP
+          livenessProbe:
+            httpGet:
+              path: /
+              port: http
+          readinessProbe:
+            httpGet:
+              path: /
+              port: http
+          resources:
+            {}
+
diff --git a/cmd/helm/testdata/testcharts/chart-with-template-lib-archive-dep/.helmignore b/cmd/helm/testdata/testcharts/chart-with-template-lib-archive-dep/.helmignore
new file mode 100644
index 000000000..f0c131944
--- /dev/null
+++ b/cmd/helm/testdata/testcharts/chart-with-template-lib-archive-dep/.helmignore
@@ -0,0 +1,21 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
diff --git a/cmd/helm/testdata/testcharts/chart-with-template-lib-archive-dep/Chart.yaml b/cmd/helm/testdata/testcharts/chart-with-template-lib-archive-dep/Chart.yaml
new file mode 100644
index 000000000..de53ce5e3
--- /dev/null
+++ b/cmd/helm/testdata/testcharts/chart-with-template-lib-archive-dep/Chart.yaml
@@ -0,0 +1,6 @@
+apiVersion: v1
+appVersion: "1.0"
+description: A Helm chart for Kubernetes
+name: chart-with-template-lib-archive-dep
+type: application
+version: 0.1.0
diff --git a/cmd/helm/testdata/testcharts/chart-with-template-lib-archive-dep/charts/common-0.0.5.tgz b/cmd/helm/testdata/testcharts/chart-with-template-lib-archive-dep/charts/common-0.0.5.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..465517824e7a2e6492cede07e7233e7120506185
GIT binary patch
literal 8446
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

literal 0
HcmV?d00001

diff --git a/cmd/helm/testdata/testcharts/chart-with-template-lib-archive-dep/templates/NOTES.txt b/cmd/helm/testdata/testcharts/chart-with-template-lib-archive-dep/templates/NOTES.txt
new file mode 100644
index 000000000..5c53ac03d
--- /dev/null
+++ b/cmd/helm/testdata/testcharts/chart-with-template-lib-archive-dep/templates/NOTES.txt
@@ -0,0 +1,19 @@
+1. Get the application URL by running these commands:
+{{- if .Values.ingress.enabled }}
+{{- range .Values.ingress.hosts }}
+  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ . }}{{ $.Values.ingress.path }}
+{{- end }}
+{{- else if contains "NodePort" .Values.service.type }}
+  export NODE_PORT=$(kubectl get -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "chart-with-template-lib-archive-dep.fullname" . }})
+  export NODE_IP=$(kubectl get nodes -o jsonpath="{.items[0].status.addresses[0].address}")
+  echo http://$NODE_IP:$NODE_PORT
+{{- else if contains "LoadBalancer" .Values.service.type }}
+     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
+           You can watch the status of by running 'kubectl get svc -w {{ template "chart-with-template-lib-archive-dep.fullname" . }}'
+  export SERVICE_IP=$(kubectl get svc {{ template "chart-with-template-lib-archive-dep.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
+  echo http://$SERVICE_IP:{{ .Values.service.port }}
+{{- else if contains "ClusterIP" .Values.service.type }}
+  export POD_NAME=$(kubectl get pods -l "app={{ template "chart-with-template-lib-archive-dep.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  echo "Visit http://127.0.0.1:8080 to use your application"
+  kubectl port-forward $POD_NAME 8080:80
+{{- end }}
diff --git a/cmd/helm/testdata/testcharts/chart-with-template-lib-archive-dep/templates/_helpers.tpl b/cmd/helm/testdata/testcharts/chart-with-template-lib-archive-dep/templates/_helpers.tpl
new file mode 100644
index 000000000..76ca56b81
--- /dev/null
+++ b/cmd/helm/testdata/testcharts/chart-with-template-lib-archive-dep/templates/_helpers.tpl
@@ -0,0 +1,32 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "chart-with-template-lib-archive-dep.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "chart-with-template-lib-archive-dep.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "chart-with-template-lib-archive-dep.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
diff --git a/cmd/helm/testdata/testcharts/chart-with-template-lib-archive-dep/templates/deployment.yaml b/cmd/helm/testdata/testcharts/chart-with-template-lib-archive-dep/templates/deployment.yaml
new file mode 100644
index 000000000..6120e7def
--- /dev/null
+++ b/cmd/helm/testdata/testcharts/chart-with-template-lib-archive-dep/templates/deployment.yaml
@@ -0,0 +1,51 @@
+apiVersion: apps/v1beta2
+kind: Deployment
+metadata:
+  name: {{ template "chart-with-template-lib-archive-dep.fullname" . }}
+  labels:
+    app: {{ template "chart-with-template-lib-archive-dep.name" . }}
+    chart: {{ template "chart-with-template-lib-archive-dep.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      app: {{ template "chart-with-template-lib-archive-dep.name" . }}
+      release: {{ .Release.Name }}
+  template:
+    metadata:
+      labels:
+        app: {{ template "chart-with-template-lib-archive-dep.name" . }}
+        release: {{ .Release.Name }}
+    spec:
+      containers:
+        - name: {{ .Chart.Name }}
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          ports:
+            - name: http
+              containerPort: 80
+              protocol: TCP
+          livenessProbe:
+            httpGet:
+              path: /
+              port: http
+          readinessProbe:
+            httpGet:
+              path: /
+              port: http
+          resources:
+{{ toYaml .Values.resources | indent 12 }}
+    {{- with .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+    {{- end }}
diff --git a/cmd/helm/testdata/testcharts/chart-with-template-lib-archive-dep/templates/ingress.yaml b/cmd/helm/testdata/testcharts/chart-with-template-lib-archive-dep/templates/ingress.yaml
new file mode 100644
index 000000000..d3325cf18
--- /dev/null
+++ b/cmd/helm/testdata/testcharts/chart-with-template-lib-archive-dep/templates/ingress.yaml
@@ -0,0 +1,38 @@
+{{- if .Values.ingress.enabled -}}
+{{- $fullName := include "chart-with-template-lib-archive-dep.fullname" . -}}
+{{- $ingressPath := .Values.ingress.path -}}
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: {{ $fullName }}
+  labels:
+    app: {{ template "chart-with-template-lib-archive-dep.name" . }}
+    chart: {{ template "chart-with-template-lib-archive-dep.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+{{- with .Values.ingress.annotations }}
+  annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
+spec:
+{{- if .Values.ingress.tls }}
+  tls:
+  {{- range .Values.ingress.tls }}
+    - hosts:
+      {{- range .hosts }}
+        - {{ . }}
+      {{- end }}
+      secretName: {{ .secretName }}
+  {{- end }}
+{{- end }}
+  rules:
+  {{- range .Values.ingress.hosts }}
+    - host: {{ . }}
+      http:
+        paths:
+          - path: {{ $ingressPath }}
+            backend:
+              serviceName: {{ $fullName }}
+              servicePort: http
+  {{- end }}
+{{- end }}
diff --git a/cmd/helm/testdata/testcharts/chart-with-template-lib-archive-dep/templates/service.yaml b/cmd/helm/testdata/testcharts/chart-with-template-lib-archive-dep/templates/service.yaml
new file mode 100644
index 000000000..bfcb080b4
--- /dev/null
+++ b/cmd/helm/testdata/testcharts/chart-with-template-lib-archive-dep/templates/service.yaml
@@ -0,0 +1,10 @@
+{{- template "common.service" (list . "chart-with-template-lib-archive-dep.service") -}}
+{{- define "chart-with-template-lib-archive-dep.service" -}}
+## Define overrides for your Service resource here, e.g.
+# metadata:
+#   labels:
+#     custom: label
+# spec:
+#   ports:
+#   - port: 8080
+{{- end -}}
diff --git a/cmd/helm/testdata/testcharts/chart-with-template-lib-archive-dep/values.yaml b/cmd/helm/testdata/testcharts/chart-with-template-lib-archive-dep/values.yaml
new file mode 100644
index 000000000..b5474cbbd
--- /dev/null
+++ b/cmd/helm/testdata/testcharts/chart-with-template-lib-archive-dep/values.yaml
@@ -0,0 +1,48 @@
+# Default values for chart-with-template-lib-archive-dep.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+replicaCount: 1
+
+image:
+  repository: nginx
+  tag: stable
+  pullPolicy: IfNotPresent
+
+nameOverride: ""
+fullnameOverride: ""
+
+service:
+  type: ClusterIP
+  port: 80
+
+ingress:
+  enabled: false
+  annotations: {}
+    # kubernetes.io/ingress.class: nginx
+    # kubernetes.io/tls-acme: "true"
+  path: /
+  hosts:
+    - chart-example.local
+  tls: []
+  #  - secretName: chart-example-tls
+  #    hosts:
+  #      - chart-example.local
+
+resources: {}
+  # We usually recommend not to specify default resources and to leave this as a conscious
+  # choice for the user. This also increases chances charts run on environments with little
+  # resources, such as Minikube. If you do want to specify resources, uncomment the following
+  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+  # limits:
+  #  cpu: 100m
+  #  memory: 128Mi
+  # requests:
+  #  cpu: 100m
+  #  memory: 128Mi
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
diff --git a/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/.helmignore b/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/.helmignore
new file mode 100644
index 000000000..f0c131944
--- /dev/null
+++ b/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/.helmignore
@@ -0,0 +1,21 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
diff --git a/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/Chart.yaml b/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/Chart.yaml
new file mode 100644
index 000000000..cf6fc390b
--- /dev/null
+++ b/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/Chart.yaml
@@ -0,0 +1,6 @@
+apiVersion: v1
+appVersion: "1.0"
+description: A Helm chart for Kubernetes
+name: chart-with-template-lib-dep
+type: application
+version: 0.1.0
diff --git a/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/.helmignore b/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/.helmignore
new file mode 100755
index 000000000..f0c131944
--- /dev/null
+++ b/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/.helmignore
@@ -0,0 +1,21 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
diff --git a/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/Chart.yaml b/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/Chart.yaml
new file mode 100755
index 000000000..ba14ca089
--- /dev/null
+++ b/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/Chart.yaml
@@ -0,0 +1,12 @@
+apiVersion: v1
+appVersion: 0.0.5
+description: Common chartbuilding components and helpers
+home: https://helm.sh
+maintainers:
+- email: technosophos@gmail.com
+  name: technosophos
+- email: adnan@bitnami.com
+  name: prydonius
+name: common
+version: 0.0.5
+type: library
diff --git a/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/README.md b/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/README.md
new file mode 100755
index 000000000..ca0459474
--- /dev/null
+++ b/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/README.md
@@ -0,0 +1,831 @@
+# Common: The Helm Helper Chart
+
+This chart is designed to make it easier for you to build and maintain Helm
+charts.
+
+It provides utilities that reflect best practices of Kubernetes chart development,
+making it faster for you to write charts.
+
+## Tips
+
+A few tips for working with Common:
+
+- Be careful when using functions that generate random data (like `common.fullname.unique`).
+  They may trigger unwanted upgrades or have other side effects.
+
+In this document, we use `RELEASE-NAME` as the name of the release.
+
+## Resource Kinds
+
+Kubernetes defines a variety of resource kinds, from `Secret` to `StatefulSet`.
+We define some of the most common kinds in a way that lets you easily work with
+them.
+
+The resource kind templates are designed to make it much faster for you to
+define _basic_ versions of these resources. They allow you to extend and modify
+just what you need, without having to copy around lots of boilerplate.
+
+To make use of these templates you must define a template that will extend the
+base template (though it can be empty). The name of this template is then passed
+to the base template, for example:
+
+```yaml
+{{- template "common.service" (list . "mychart.service") -}}
+{{- define "mychart.service" -}}
+## Define overrides for your Service resource here, e.g.
+# metadata:
+#   labels:
+#     custom: label
+# spec:
+#   ports:
+#   - port: 8080
+{{- end -}}
+```
+
+Note that the `common.service` template defines two parameters:
+
+  - The root context (usually `.`)
+  - A template name containing the service definition overrides
+
+A limitation of the Go template library is that a template can only take a
+single argument. The `list` function is used to workaround this by constructing
+a list or array of arguments that is passed to the template.
+
+The `common.service` template is responsible for rendering the templates with
+the root context and merging any overrides. As you can see, this makes it very
+easy to create a basic `Service` resource without having to copy around the
+standard metadata and labels.
+
+Each implemented base resource is described in greater detail below.
+
+### `common.service`
+
+The `common.service` template creates a basic `Service` resource with the
+following defaults:
+
+- Service type (ClusterIP, NodePort, LoadBalancer) made configurable by `.Values.service.type`
+- Named port `http` configured on port 80
+- Selector set to `app: {{ template "common.name" }}, release: {{ .Release.Name | quote }}` to match the default used in the `Deployment` resource
+
+Example template:
+
+```yaml
+{{- template "common.service" (list . "mychart.mail.service") -}}
+{{- define "mychart.mail.service" -}}
+metadata:
+  name: {{ template "common.fullname" . }}-mail # overrides the default name to add a suffix
+  labels:                                       # appended to the labels section
+    protocol: mail
+spec:
+  ports:                                        # composes the `ports` section of the service definition.
+  - name: smtp
+    port: 25
+    targetPort: 25
+  - name: imaps
+    port: 993
+    targetPort: 993
+  selector:                                     # this is appended to the default selector
+    protocol: mail
+{{- end -}}
+---
+{{ template "common.service" (list . "mychart.web.service") -}}
+{{- define "mychart.web.service" -}}
+metadata:
+  name: {{ template "common.fullname" . }}-www  # overrides the default name to add a suffix
+  labels:                                       # appended to the labels section
+    protocol: www
+spec:
+  ports:                                        # composes the `ports` section of the service definition.
+  - name: www
+    port: 80
+    targetPort: 8080
+{{- end -}}
+```
+
+The above template defines _two_ services: a web service and a mail service.
+
+The most important part of a service definition is the `ports` object, which
+defines the ports that this service will listen on. Most of the time,
+`selector` is computed for you. But you can replace it or add to it.
+
+The output of the example above is:
+
+```yaml
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app: service
+    chart: service-0.1.0
+    heritage: Tiller
+    protocol: mail
+    release: release-name
+  name: release-name-service-mail
+spec:
+  ports:
+  - name: smtp
+    port: 25
+    targetPort: 25
+  - name: imaps
+    port: 993
+    targetPort: 993
+  selector:
+    app: service
+    release: release-name
+    protocol: mail
+  type: ClusterIP
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app: service
+    chart: service-0.1.0
+    heritage: Tiller
+    protocol: www
+    release: release-name
+  name: release-name-service-www
+spec:
+  ports:
+  - name: www
+    port: 80
+    targetPort: 8080
+  type: ClusterIP
+```
+
+## `common.deployment`
+
+The `common.deployment` template defines a basic `Deployment`. Underneath the
+hood, it uses `common.container` (see next section).
+
+By default, the pod template within the deployment defines the labels `app: {{ template "common.name" . }}`
+and `release: {{ .Release.Name | quote }` as this is also used as the selector. The
+standard set of labels are not used as some of these can change during upgrades,
+which causes the replica sets and pods to not correctly match.
+
+Example use:
+
+```yaml
+{{- template "common.deployment" (list . "mychart.deployment") -}}
+{{- define "mychart.deployment" -}}
+## Define overrides for your Deployment resource here, e.g.
+spec:
+  replicas: {{ .Values.replicaCount }}
+{{- end -}}
+```
+
+## `common.container`
+
+The `common.container` template creates a basic `Container` spec to be used
+within a `Deployment` or `ReplicaSet`. It holds the following defaults:
+
+- The name is set to the chart name
+- Uses `.Values.image` to describe the image to run, with the following spec:
+  ```yaml
+  image:
+    repository: nginx
+    tag: stable
+    pullPolicy: IfNotPresent
+  ```
+- Exposes the named port `http` as port 80
+- Lays out the compute resources using `.Values.resources`
+
+Example use:
+
+```yaml
+{{- template "common.deployment" (list . "mychart.deployment") -}}
+{{- define "mychart.deployment" -}}
+## Define overrides for your Deployment resource here, e.g.
+spec:
+  template:
+    spec:
+      containers:
+      - {{ template "common.container" (list . "mychart.deployment.container") }}
+{{- end -}}
+{{- define "mychart.deployment.container" -}}
+## Define overrides for your Container here, e.g.
+livenessProbe:
+  httpGet:
+    path: /
+    port: 80
+readinessProbe:
+  httpGet:
+    path: /
+    port: 80
+{{- end -}}
+```
+
+The above example creates a `Deployment` resource which makes use of the
+`common.container` template to populate the PodSpec's container list. The usage
+of this template is similar to the other resources, you must define and
+reference a template that contains overrides for the container object.
+
+The most important part of a container definition is the image you want to run.
+As mentioned above, this is derived from `.Values.image` by default. It is a
+best practice to define the image, tag and pull policy in your charts' values as
+this makes it easy for an operator to change the image registry, or use a
+specific tag or version. Another example of configuration that should be exposed
+to chart operators is the container's required compute resources, as this is
+also very specific to an operators environment. An example `values.yaml` for
+your chart could look like:
+
+```yaml
+image:
+  repository: nginx
+  tag: stable
+  pullPolicy: IfNotPresent
+resources:
+  limits:
+    cpu: 100m
+    memory: 128Mi
+  requests:
+    cpu: 100m
+    memory: 128Mi
+```
+
+The output of running the above values through the earlier template is:
+
+```yaml
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  labels:
+    app: deployment
+    chart: deployment-0.1.0
+    heritage: Tiller
+    release: release-name
+  name: release-name-deployment
+spec:
+  template:
+    metadata:
+      labels:
+        app: deployment
+    spec:
+      containers:
+      - image: nginx:stable
+        imagePullPolicy: IfNotPresent
+        livenessProbe:
+          httpGet:
+            path: /
+            port: 80
+        name: deployment
+        ports:
+        - containerPort: 80
+          name: http
+        readinessProbe:
+          httpGet:
+            path: /
+            port: 80
+        resources:
+          limits:
+            cpu: 100m
+            memory: 128Mi
+          requests:
+            cpu: 100m
+            memory: 128Mi
+```
+
+## `common.configmap`
+
+The `common.configmap` template creates an empty `ConfigMap` resource that you
+can override with your configuration.
+
+Example use:
+
+```yaml
+{{- template "common.configmap" (list . "mychart.configmap") -}}
+{{- define "mychart.configmap" -}}
+data:
+  zeus: cat
+  athena: cat
+  julius: cat
+  one: |-
+    {{ .Files.Get "file1.txt" }}
+{{- end -}}
+```
+
+Output:
+
+```yaml
+apiVersion: v1
+data:
+  athena: cat
+  julius: cat
+  one: This is a file.
+  zeus: cat
+kind: ConfigMap
+metadata:
+  labels:
+    app: configmap
+    chart: configmap-0.1.0
+    heritage: Tiller
+    release: release-name
+  name: release-name-configmap
+```
+
+## `common.secret`
+
+The `common.secret` template creates an empty `Secret` resource that you
+can override with your secrets.
+
+Example use:
+
+```yaml
+{{- template "common.secret" (list . "mychart.secret") -}}
+{{- define "mychart.secret" -}}
+data:
+  zeus: {{ print "cat" | b64enc }}
+  athena: {{ print "cat" | b64enc }}
+  julius: {{ print "cat" | b64enc }}
+  one: |-
+    {{ .Files.Get "file1.txt" | b64enc }}
+{{- end -}}
+```
+
+Output:
+
+```yaml
+apiVersion: v1
+data:
+  athena: Y2F0
+  julius: Y2F0
+  one: VGhpcyBpcyBhIGZpbGUuCg==
+  zeus: Y2F0
+kind: Secret
+metadata:
+  labels:
+    app: secret
+    chart: secret-0.1.0
+    heritage: Tiller
+    release: release-name
+  name: release-name-secret
+type: Opaque
+```
+
+## `common.ingress`
+
+The `common.ingress` template is designed to give you a well-defined `Ingress`
+resource, that can be configured using `.Values.ingress`. An example values file
+that can be used to configure the `Ingress` resource is:
+
+```yaml
+ingress:
+  hosts:
+  - chart-example.local
+  annotations:
+    kubernetes.io/ingress.class: nginx
+    kubernetes.io/tls-acme: "true"
+  tls:
+  - secretName: chart-example-tls
+    hosts:
+    - chart-example.local
+```
+
+Example use:
+
+```yaml
+{{- template "common.ingress" (list . "mychart.ingress") -}}
+{{- define "mychart.ingress" -}}
+{{- end -}}
+```
+
+Output:
+
+```yaml
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  annotations:
+    kubernetes.io/ingress.class: nginx
+    kubernetes.io/tls-acme: "true"
+  labels:
+    app: ingress
+    chart: ingress-0.1.0
+    heritage: Tiller
+    release: release-name
+  name: release-name-ingress
+spec:
+  rules:
+  - host: chart-example.local
+    http:
+      paths:
+      - backend:
+          serviceName: release-name-ingress
+          servicePort: 80
+        path: /
+  tls:
+  - hosts:
+    - chart-example.local
+    secretName: chart-example-tls
+```
+
+## `common.persistentvolumeclaim`
+
+`common.persistentvolumeclaim` can be used to easily add a
+`PersistentVolumeClaim` resource to your chart that can be configured using
+`.Values.persistence`:
+
+|           Value           |                                               Description                                               |
+| ------------------------- | ------------------------------------------------------------------------------------------------------- |
+| persistence.enabled       | Whether or not to claim a persistent volume. If false, `common.volume.pvc` will use an emptyDir instead |
+| persistence.storageClass  | `StorageClass` name                                                                                     |
+| persistence.accessMode    | Access mode for persistent volume                                                                       |
+| persistence.size          | Size of persistent volume                                                                               |
+| persistence.existingClaim | If defined, `PersistentVolumeClaim` is not created and `common.volume.pvc` helper uses this claim       |
+
+An example values file that can be used to configure the
+`PersistentVolumeClaim` resource is:
+
+```yaml
+persistence:
+  enabled: true
+  storageClass: fast
+  accessMode: ReadWriteOnce
+  size: 8Gi
+```
+
+Example use:
+
+```yaml
+{{- template "common.persistentvolumeclaim" (list . "mychart.persistentvolumeclaim") -}}
+{{- define "mychart.persistentvolumeclaim" -}}
+{{- end -}}
+```
+
+Output:
+
+```yaml
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  labels:
+    app: persistentvolumeclaim
+    chart: persistentvolumeclaim-0.1.0
+    heritage: Tiller
+    release: release-name
+  name: release-name-persistentvolumeclaim
+spec:
+  accessModes:
+  - ReadWriteOnce
+  resources:
+    requests:
+      storage: 8Gi
+  storageClassName: "fast"
+```
+
+## Partial API Objects
+
+When writing Kubernetes resources, you may find the following helpers useful to
+construct parts of the spec.
+
+### EnvVar
+
+Use the EnvVar helpers within a container spec to simplify specifying key-value
+environment variables or referencing secrets as values.
+
+Example Use:
+
+```yaml
+{{- template "common.deployment" (list . "mychart.deployment") -}}
+{{- define "mychart.deployment" -}}
+spec:
+  template:
+    spec:
+      containers:
+      - {{ template "common.container" (list . "mychart.deployment.container") }}
+{{- end -}}
+{{- define "mychart.deployment.container" -}}
+{{- $fullname := include "common.fullname" . -}}
+env:
+- {{ template "common.envvar.value" (list "ZEUS" "cat") }}
+- {{ template "common.envvar.secret" (list "ATHENA" "secret-name" "athena") }}
+{{- end -}}
+```
+
+Output:
+
+```yaml
+...
+    spec:
+      containers:
+      - env:
+        - name: ZEUS
+          value: cat
+        - name: ATHENA
+          valueFrom:
+            secretKeyRef:
+              key: athena
+              name: secret-name
+...
+```
+
+### Volume
+
+Use the Volume helpers within a `Deployment` spec to help define ConfigMap and
+PersistentVolumeClaim volumes.
+
+Example Use:
+
+```yaml
+{{- template "common.deployment" (list . "mychart.deployment") -}}
+{{- define "mychart.deployment" -}}
+spec:
+  template:
+    spec:
+      volumes:
+      - {{ template "common.volume.configMap" (list "config" "configmap-name") }}
+      - {{ template "common.volume.pvc" (list "data" "pvc-name" .Values.persistence) }}
+{{- end -}}
+```
+
+Output:
+
+```yaml
+...
+    spec:
+      volumes:
+      - configMap:
+          name: configmap-name
+        name: config
+      - name: data
+        persistentVolumeClaim:
+          claimName: pvc-name
+...
+```
+
+The `common.volume.pvc` helper uses the following configuration from the `.Values.persistence` object:
+
+|           Value           |                      Description                      |
+| ------------------------- | ----------------------------------------------------- |
+| persistence.enabled       | If false, creates an `emptyDir` instead               |
+| persistence.existingClaim | If set, uses this instead of the passed in claim name |
+
+## Utilities
+
+### `common.fullname`
+
+The `common.fullname` template generates a name suitable for the `name:` field
+in Kubernetes metadata. It is used like this:
+
+```yaml
+name: {{ template "common.fullname" . }}
+```
+
+The following different values can influence it:
+
+```yaml
+# By default, fullname uses '{{ .Release.Name }}-{{ .Chart.Name }}'. This
+# overrides that and uses the given string instead.
+fullnameOverride: "some-name"
+
+# This adds a prefix
+fullnamePrefix: "pre-"
+# This appends a suffix
+fullnameSuffix: "-suf"
+
+# Global versions of the above
+global:
+  fullnamePrefix: "pp-"
+  fullnameSuffix: "-ps"
+```
+
+Example output:
+
+```yaml
+---
+# with the values above
+name: pp-pre-some-name-suf-ps
+
+---
+# the default, for release "happy-panda" and chart "wordpress"
+name: happy-panda-wordpress
+```
+
+Output of this function is truncated at 54 characters, which leaves 9 additional
+characters for customized overriding. Thus you can easily extend this name
+in your own charts:
+
+```yaml
+{{- define "my.fullname" -}}
+  {{ template "common.fullname" . }}-my-stuff
+{{- end -}}
+```
+
+### `common.fullname.unique`
+
+The `common.fullname.unique` variant of fullname appends a unique seven-character
+sequence to the end of the common name field.
+
+This takes all of the same parameters as `common.fullname`
+
+Example template:
+
+```yaml
+uniqueName: {{ template "common.fullname.unique" . }}
+```
+
+Example output:
+
+```yaml
+uniqueName: release-name-fullname-jl0dbwx
+```
+
+It is also impacted by the prefix and suffix definitions, as well as by
+`.Values.fullnameOverride`
+
+Note that the effective maximum length of this function is 63 characters, not 54.
+
+### `common.name`
+
+The `common.name` template generates a name suitable for the `app` label. It is used like this:
+
+```yaml
+app: {{ template "common.name" . }}
+```
+
+The following different values can influence it:
+
+```yaml
+# By default, name uses '{{ .Chart.Name }}'. This
+# overrides that and uses the given string instead.
+nameOverride: "some-name"
+
+# This adds a prefix
+namePrefix: "pre-"
+# This appends a suffix
+nameSuffix: "-suf"
+
+# Global versions of the above
+global:
+  namePrefix: "pp-"
+  nameSuffix: "-ps"
+```
+
+Example output:
+
+```yaml
+---
+# with the values above
+name: pp-pre-some-name-suf-ps
+
+---
+# the default, for chart "wordpress"
+name: wordpress
+```
+
+Output of this function is truncated at 54 characters, which leaves 9 additional
+characters for customized overriding. Thus you can easily extend this name
+in your own charts:
+
+```yaml
+{{- define "my.name" -}}
+  {{ template "common.name" . }}-my-stuff
+{{- end -}}
+```
+
+### `common.metadata`
+
+The `common.metadata` helper generates the `metadata:` section of a Kubernetes
+resource.
+
+This takes three objects:
+  - .top: top context
+  - .fullnameOverride: override the fullname with this name
+  - .metadata
+    - .labels: key/value list of labels
+    - .annotations: key/value list of annotations
+    - .hook: name(s) of hook(s)
+
+It generates standard labels, annotations, hooks, and a name field.
+
+Example template:
+
+```yaml
+{{ template "common.metadata" (dict "top" . "metadata" .Values.bio) }}
+---
+{{ template "common.metadata" (dict "top" . "metadata" .Values.pet "fullnameOverride" .Values.pet.fullnameOverride) }}
+```
+
+Example values:
+
+```yaml
+bio:
+  name: example
+  labels:
+    first: matt
+    last: butcher
+    nick: technosophos
+  annotations:
+    format: bio
+    destination: archive
+  hook: pre-install
+
+pet:
+  fullnameOverride: Zeus
+
+```
+
+Example output:
+
+```yaml
+metadata:
+  name: release-name-metadata
+  labels:
+    app: metadata
+    heritage: "Tiller"
+    release: "RELEASE-NAME"
+    chart: metadata-0.1.0
+    first: "matt"
+    last: "butcher"
+    nick: "technosophos"
+  annotations:
+    "destination": "archive"
+    "format": "bio"
+    "helm.sh/hook": "pre-install"
+---
+metadata:
+  name: Zeus
+  labels:
+    app: metadata
+    heritage: "Tiller"
+    release: "RELEASE-NAME"
+    chart: metadata-0.1.0
+  annotations:
+```
+
+Most of the common templates that define a resource type (e.g. `common.configmap`
+or `common.job`) use this to generate the metadata, which means they inherit
+the same `labels`, `annotations`, `nameOverride`, and `hook` fields.
+
+### `common.labelize`
+
+`common.labelize` turns a map into a set of labels.
+
+Example template:
+
+```yaml
+{{- $map := dict "first" "1" "second" "2" "third" "3" -}}
+{{- template "common.labelize" $map -}}
+```
+
+Example output:
+
+```yaml
+first: "1"
+second: "2"
+third: "3"
+```
+
+### `common.labels.standard`
+
+`common.labels.standard` prints the standard set of labels.
+
+Example usage:
+
+```
+{{ template "common.labels.standard" . }}
+```
+
+Example output:
+
+```yaml
+app: labelizer
+heritage: "Tiller"
+release: "RELEASE-NAME"
+chart: labelizer-0.1.0
+```
+
+### `common.hook`
+
+The `common.hook` template is a convenience for defining hooks.
+
+Example template:
+
+```yaml
+{{ template "common.hook" "pre-install,post-install" }}
+```
+
+Example output:
+
+```yaml
+"helm.sh/hook": "pre-install,post-install"
+```
+
+### `common.chartref`
+
+The `common.chartref` helper prints the chart name and version, escaped to be
+legal in a Kubernetes label field.
+
+Example template:
+
+```yaml
+chartref: {{ template "common.chartref" . }}
+```
+
+For the chart `foo` with version `1.2.3-beta.55+1234`, this will render:
+
+```yaml
+chartref: foo-1.2.3-beta.55_1234
+```
+
+(Note that `+` is an illegal character in label values)
diff --git a/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/templates/_chartref.tpl b/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/templates/_chartref.tpl
new file mode 100755
index 000000000..e6c14866f
--- /dev/null
+++ b/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/templates/_chartref.tpl
@@ -0,0 +1,14 @@
+{{- /*
+common.chartref prints a chart name and version.
+
+It does minimal escaping for use in Kubernetes labels.
+
+Example output:
+
+  zookeeper-1.2.3
+  wordpress-3.2.1_20170219
+
+*/ -}}
+{{- define "common.chartref" -}}
+  {{- replace "+" "_" .Chart.Version | printf "%s-%s" .Chart.Name -}}
+{{- end -}}
diff --git a/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/templates/_configmap.yaml b/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/templates/_configmap.yaml
new file mode 100755
index 000000000..03dbbf858
--- /dev/null
+++ b/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/templates/_configmap.yaml
@@ -0,0 +1,9 @@
+{{- define "common.configmap.tpl" -}}
+apiVersion: v1
+kind: ConfigMap
+{{ template "common.metadata" . }}
+data: {}
+{{- end -}}
+{{- define "common.configmap" -}}
+{{- template "common.util.merge" (append . "common.configmap.tpl") -}}
+{{- end -}}
diff --git a/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/templates/_container.yaml b/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/templates/_container.yaml
new file mode 100755
index 000000000..540eb0e6a
--- /dev/null
+++ b/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/templates/_container.yaml
@@ -0,0 +1,15 @@
+{{- define "common.container.tpl" -}}
+name: {{ .Chart.Name }}
+image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+imagePullPolicy: {{ .Values.image.pullPolicy }}
+ports:
+- name: http
+  containerPort: 80
+resources:
+{{ toYaml .Values.resources | indent 2 }}
+{{- end -}}
+{{- define "common.container" -}}
+{{- /* clear new line so indentation works correctly */ -}}
+{{- println "" -}}
+{{- include "common.util.merge" (append . "common.container.tpl") | indent 8 -}}
+{{- end -}}
diff --git a/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/templates/_deployment.yaml b/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/templates/_deployment.yaml
new file mode 100755
index 000000000..c49dae3eb
--- /dev/null
+++ b/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/templates/_deployment.yaml
@@ -0,0 +1,18 @@
+{{- define "common.deployment.tpl" -}}
+apiVersion: extensions/v1beta1
+kind: Deployment
+{{ template "common.metadata" . }}
+spec:
+  template:
+    metadata:
+      labels:
+        app: {{ template "common.name" . }}
+        release: {{ .Release.Name | quote }}
+    spec:
+      containers:
+      -
+{{ include "common.container.tpl" . | indent 8 }}
+{{- end -}}
+{{- define "common.deployment" -}}
+{{- template "common.util.merge" (append . "common.deployment.tpl") -}}
+{{- end -}}
diff --git a/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/templates/_envvar.tpl b/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/templates/_envvar.tpl
new file mode 100755
index 000000000..709251f8f
--- /dev/null
+++ b/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/templates/_envvar.tpl
@@ -0,0 +1,31 @@
+{{- define "common.envvar.value" -}}
+  {{- $name := index . 0 -}}
+  {{- $value := index . 1 -}}
+
+  name: {{ $name }}
+  value: {{ default "" $value | quote }}
+{{- end -}}
+
+{{- define "common.envvar.configmap" -}}
+  {{- $name := index . 0 -}}
+  {{- $configMapName := index . 1 -}}
+  {{- $configMapKey := index . 2 -}}
+
+  name: {{ $name }}
+  valueFrom:
+    configMapKeyRef:
+      name: {{ $configMapName }}
+      key: {{ $configMapKey }}
+{{- end -}}
+
+{{- define "common.envvar.secret" -}}
+  {{- $name := index . 0 -}}
+  {{- $secretName := index . 1 -}}
+  {{- $secretKey := index . 2 -}}
+
+  name: {{ $name }}
+  valueFrom:
+    secretKeyRef:
+      name: {{ $secretName }}
+      key: {{ $secretKey }}
+{{- end -}}
diff --git a/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/templates/_fullname.tpl b/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/templates/_fullname.tpl
new file mode 100755
index 000000000..2da6cdf18
--- /dev/null
+++ b/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/templates/_fullname.tpl
@@ -0,0 +1,39 @@
+{{- /*
+fullname defines a suitably unique name for a resource by combining
+the release name and the chart name.
+
+The prevailing wisdom is that names should only contain a-z, 0-9 plus dot (.) and dash (-), and should
+not exceed 63 characters.
+
+Parameters:
+
+- .Values.fullnameOverride: Replaces the computed name with this given name
+- .Values.fullnamePrefix: Prefix
+- .Values.global.fullnamePrefix: Global prefix
+- .Values.fullnameSuffix: Suffix
+- .Values.global.fullnameSuffix: Global suffix
+
+The applied order is: "global prefix + prefix + name + suffix + global suffix"
+
+Usage: 'name: "{{- template "common.fullname" . -}}"'
+*/ -}}
+{{- define "common.fullname"}}
+  {{- $global := default (dict) .Values.global -}}
+  {{- $base := default (printf "%s-%s" .Release.Name .Chart.Name) .Values.fullnameOverride -}}
+  {{- $gpre := default "" $global.fullnamePrefix -}}
+  {{- $pre := default "" .Values.fullnamePrefix -}}
+  {{- $suf := default "" .Values.fullnameSuffix -}}
+  {{- $gsuf := default "" $global.fullnameSuffix -}}
+  {{- $name := print $gpre $pre $base $suf $gsuf -}}
+  {{- $name | lower | trunc 54 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- /*
+common.fullname.unique adds a random suffix to the unique name.
+
+This takes the same parameters as common.fullname
+
+*/ -}}
+{{- define "common.fullname.unique" -}}
+  {{ template "common.fullname" . }}-{{ randAlphaNum 7 | lower }}
+{{- end }}
diff --git a/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/templates/_ingress.yaml b/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/templates/_ingress.yaml
new file mode 100755
index 000000000..522ab2425
--- /dev/null
+++ b/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/templates/_ingress.yaml
@@ -0,0 +1,27 @@
+{{- define "common.ingress.tpl" -}}
+apiVersion: extensions/v1beta1
+kind: Ingress
+{{ template "common.metadata" . }}
+  {{- if .Values.ingress.annotations }}
+  annotations:
+    {{ include "common.annote" .Values.ingress.annotations | indent 4 }}
+  {{- end }}
+spec:
+  rules:
+  {{- range $host := .Values.ingress.hosts }}
+  - host: {{ $host }}
+    http:
+      paths:
+      - path: /
+        backend:
+          serviceName: {{ template "common.fullname" $ }}
+          servicePort: 80
+  {{- end }}
+  {{- if .Values.ingress.tls }}
+  tls:
+{{ toYaml .Values.ingress.tls | indent 4 }}
+  {{- end -}}
+{{- end -}}
+{{- define "common.ingress" -}}
+{{- template "common.util.merge" (append . "common.ingress.tpl") -}}
+{{- end -}}
diff --git a/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/templates/_metadata.yaml b/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/templates/_metadata.yaml
new file mode 100755
index 000000000..f96ed09fe
--- /dev/null
+++ b/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/templates/_metadata.yaml
@@ -0,0 +1,10 @@
+{{- /*
+common.metadata creates a standard metadata header.
+It creates a 'metadata:' section with name and labels.
+*/ -}}
+{{ define "common.metadata" -}}
+metadata:
+  name: {{ template "common.fullname" . }}
+  labels:
+{{ include "common.labels.standard" . | indent 4 -}}
+{{- end -}}
diff --git a/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/templates/_metadata_annotations.tpl b/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/templates/_metadata_annotations.tpl
new file mode 100755
index 000000000..0c3b61c7c
--- /dev/null
+++ b/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/templates/_metadata_annotations.tpl
@@ -0,0 +1,18 @@
+{{- /*
+common.hook defines a hook.
+
+This is to be used in a 'metadata.annotations' section.
+
+This should be called as 'template "common.metadata.hook" "post-install"'
+
+Any valid hook may be passed in. Separate multiple hooks with a ",".
+*/ -}}
+{{- define "common.hook" -}}
+"helm.sh/hook": {{printf "%s" . | quote}}
+{{- end -}}
+
+{{- define "common.annote" -}}
+{{- range $k, $v := . }}
+{{ $k | quote }}: {{ $v | quote }}
+{{- end -}}
+{{- end -}}
diff --git a/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/templates/_metadata_labels.tpl b/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/templates/_metadata_labels.tpl
new file mode 100755
index 000000000..15fe00c5f
--- /dev/null
+++ b/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/templates/_metadata_labels.tpl
@@ -0,0 +1,28 @@
+{{- /*
+common.labelize takes a dict or map and generates labels.
+
+Values will be quoted. Keys will not.
+
+Example output:
+
+  first: "Matt"
+  last: "Butcher"
+
+*/ -}}
+{{- define "common.labelize" -}}
+{{- range $k, $v := . }}
+{{ $k }}: {{ $v | quote }}
+{{- end -}}
+{{- end -}}
+
+{{- /*
+common.labels.standard prints the standard Helm labels.
+
+The standard labels are frequently used in metadata.
+*/ -}}
+{{- define "common.labels.standard" -}}
+app: {{ template "common.name" . }}
+chart: {{ template "common.chartref" . }}
+heritage: {{ .Release.Service | quote }}
+release: {{ .Release.Name | quote }}
+{{- end -}}
diff --git a/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/templates/_name.tpl b/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/templates/_name.tpl
new file mode 100755
index 000000000..1d42fb068
--- /dev/null
+++ b/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/templates/_name.tpl
@@ -0,0 +1,29 @@
+{{- /*
+name defines a template for the name of the chart. It should be used for the `app` label. 
+This is common practice in many Kubernetes manifests, and is not Helm-specific.
+
+The prevailing wisdom is that names should only contain a-z, 0-9 plus dot (.) and dash (-), and should
+not exceed 63 characters.
+
+Parameters:
+
+- .Values.nameOverride: Replaces the computed name with this given name
+- .Values.namePrefix: Prefix
+- .Values.global.namePrefix: Global prefix
+- .Values.nameSuffix: Suffix
+- .Values.global.nameSuffix: Global suffix
+
+The applied order is: "global prefix + prefix + name + suffix + global suffix"
+
+Usage: 'name: "{{- template "common.name" . -}}"'
+*/ -}}
+{{- define "common.name"}}
+  {{- $global := default (dict) .Values.global -}}
+  {{- $base := default .Chart.Name .Values.nameOverride -}}
+  {{- $gpre := default "" $global.namePrefix -}}
+  {{- $pre := default "" .Values.namePrefix -}}
+  {{- $suf := default "" .Values.nameSuffix -}}
+  {{- $gsuf := default "" $global.nameSuffix -}}
+  {{- $name := print $gpre $pre $base $suf $gsuf -}}
+  {{- $name | lower | trunc 54 | trimSuffix "-" -}}
+{{- end -}}
diff --git a/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/templates/_persistentvolumeclaim.yaml b/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/templates/_persistentvolumeclaim.yaml
new file mode 100755
index 000000000..6c1578c7e
--- /dev/null
+++ b/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/templates/_persistentvolumeclaim.yaml
@@ -0,0 +1,24 @@
+{{- define "common.persistentvolumeclaim.tpl" -}}
+apiVersion: v1
+kind: PersistentVolumeClaim
+{{ template "common.metadata" . }}
+spec:
+  accessModes:
+    - {{ .Values.persistence.accessMode | quote }}
+  resources:
+    requests:
+      storage: {{ .Values.persistence.size | quote }}
+{{- if .Values.persistence.storageClass }}
+{{- if (eq "-" .Values.persistence.storageClass) }}
+  storageClassName: ""
+{{- else }}
+  storageClassName: "{{ .Values.persistence.storageClass }}"
+{{- end }}
+{{- end }}
+{{- end -}}
+{{- define "common.persistentvolumeclaim" -}}
+{{- $top := first . -}}
+{{- if and $top.Values.persistence.enabled (not $top.Values.persistence.existingClaim) -}}
+{{- template "common.util.merge" (append . "common.persistentvolumeclaim.tpl") -}}
+{{- end -}}
+{{- end -}}
diff --git a/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/templates/_secret.yaml b/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/templates/_secret.yaml
new file mode 100755
index 000000000..0615d35cb
--- /dev/null
+++ b/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/templates/_secret.yaml
@@ -0,0 +1,10 @@
+{{- define "common.secret.tpl" -}}
+apiVersion: v1
+kind: Secret
+{{ template "common.metadata" . }}
+type: Opaque
+data: {}
+{{- end -}}
+{{- define "common.secret" -}}
+{{- template "common.util.merge" (append . "common.secret.tpl") -}}
+{{- end -}}
diff --git a/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/templates/_service.yaml b/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/templates/_service.yaml
new file mode 100755
index 000000000..67379525f
--- /dev/null
+++ b/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/templates/_service.yaml
@@ -0,0 +1,17 @@
+{{- define "common.service.tpl" -}}
+apiVersion: v1
+kind: Service
+{{ template "common.metadata" . }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+  - name: http
+    port: 80
+    targetPort: http
+  selector:
+    app: {{ template "common.name" . }}
+    release: {{ .Release.Name | quote }}
+{{- end -}}
+{{- define "common.service" -}}
+{{- template "common.util.merge" (append . "common.service.tpl") -}}
+{{- end -}}
diff --git a/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/templates/_util.tpl b/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/templates/_util.tpl
new file mode 100755
index 000000000..a7d4cc751
--- /dev/null
+++ b/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/templates/_util.tpl
@@ -0,0 +1,15 @@
+{{- /*
+common.util.merge will merge two YAML templates and output the result.
+
+This takes an array of three values:
+- the top context
+- the template name of the overrides (destination)
+- the template name of the base (source)
+
+*/ -}}
+{{- define "common.util.merge" -}}
+{{- $top := first . -}}
+{{- $overrides := fromYaml (include (index . 1) $top) | default (dict ) -}}
+{{- $tpl := fromYaml (include (index . 2) $top) | default (dict ) -}}
+{{- toYaml (merge $overrides $tpl) -}}
+{{- end -}}
diff --git a/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/templates/_volume.tpl b/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/templates/_volume.tpl
new file mode 100755
index 000000000..521a1f48b
--- /dev/null
+++ b/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/templates/_volume.tpl
@@ -0,0 +1,22 @@
+{{- define "common.volume.configMap" -}}
+        {{- $name := index . 0 -}}
+        {{- $configMapName := index . 1 -}}
+
+        name: {{ $name }}
+        configMap:
+          name: {{ $configMapName }}
+{{- end -}}
+
+{{- define "common.volume.pvc" -}}
+        {{- $name := index . 0 -}}
+        {{- $claimName := index . 1 -}}
+        {{- $persistence := index . 2 -}}
+
+        name: {{ $name }}
+        {{- if $persistence.enabled }}
+        persistentVolumeClaim:
+          claimName: {{ $persistence.existingClaim | default $claimName }}
+        {{- else }}
+        emptyDir: {}
+        {{- end -}}
+{{- end -}}
diff --git a/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/templates/configmap.yaml b/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/templates/configmap.yaml
new file mode 100644
index 000000000..b5bf1dfc3
--- /dev/null
+++ b/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/templates/configmap.yaml
@@ -0,0 +1,6 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: common-configmap
+data:
+  myvalue: "Hello World"
diff --git a/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/values.yaml b/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/values.yaml
new file mode 100755
index 000000000..b7cf514d5
--- /dev/null
+++ b/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/charts/common/values.yaml
@@ -0,0 +1,4 @@
+# Default values for commons.
+# This is a YAML-formatted file.
+# Declare name/value pairs to be passed into your templates.
+# name: value
diff --git a/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/templates/NOTES.txt b/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/templates/NOTES.txt
new file mode 100644
index 000000000..8f6bb9b1d
--- /dev/null
+++ b/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/templates/NOTES.txt
@@ -0,0 +1,19 @@
+1. Get the application URL by running these commands:
+{{- if .Values.ingress.enabled }}
+{{- range .Values.ingress.hosts }}
+  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ . }}{{ $.Values.ingress.path }}
+{{- end }}
+{{- else if contains "NodePort" .Values.service.type }}
+  export NODE_PORT=$(kubectl get -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "chart-with-template-lib-dep.fullname" . }})
+  export NODE_IP=$(kubectl get nodes -o jsonpath="{.items[0].status.addresses[0].address}")
+  echo http://$NODE_IP:$NODE_PORT
+{{- else if contains "LoadBalancer" .Values.service.type }}
+     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
+           You can watch the status of by running 'kubectl get svc -w {{ template "chart-with-template-lib-dep.fullname" . }}'
+  export SERVICE_IP=$(kubectl get svc {{ template "chart-with-template-lib-dep.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
+  echo http://$SERVICE_IP:{{ .Values.service.port }}
+{{- else if contains "ClusterIP" .Values.service.type }}
+  export POD_NAME=$(kubectl get pods -l "app={{ template "chart-with-template-lib-dep.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  echo "Visit http://127.0.0.1:8080 to use your application"
+  kubectl port-forward $POD_NAME 8080:80
+{{- end }}
diff --git a/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/templates/_helpers.tpl b/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/templates/_helpers.tpl
new file mode 100644
index 000000000..0ab79743d
--- /dev/null
+++ b/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/templates/_helpers.tpl
@@ -0,0 +1,32 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "chart-with-template-lib-dep.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "chart-with-template-lib-dep.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "chart-with-template-lib-dep.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
diff --git a/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/templates/deployment.yaml b/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/templates/deployment.yaml
new file mode 100644
index 000000000..c447579d0
--- /dev/null
+++ b/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/templates/deployment.yaml
@@ -0,0 +1,51 @@
+apiVersion: apps/v1beta2
+kind: Deployment
+metadata:
+  name: {{ template "chart-with-template-lib-dep.fullname" . }}
+  labels:
+    app: {{ template "chart-with-template-lib-dep.name" . }}
+    chart: {{ template "chart-with-template-lib-dep.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      app: {{ template "chart-with-template-lib-dep.name" . }}
+      release: {{ .Release.Name }}
+  template:
+    metadata:
+      labels:
+        app: {{ template "chart-with-template-lib-dep.name" . }}
+        release: {{ .Release.Name }}
+    spec:
+      containers:
+        - name: {{ .Chart.Name }}
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          ports:
+            - name: http
+              containerPort: 80
+              protocol: TCP
+          livenessProbe:
+            httpGet:
+              path: /
+              port: http
+          readinessProbe:
+            httpGet:
+              path: /
+              port: http
+          resources:
+{{ toYaml .Values.resources | indent 12 }}
+    {{- with .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+    {{- end }}
diff --git a/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/templates/ingress.yaml b/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/templates/ingress.yaml
new file mode 100644
index 000000000..a978df4e7
--- /dev/null
+++ b/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/templates/ingress.yaml
@@ -0,0 +1,38 @@
+{{- if .Values.ingress.enabled -}}
+{{- $fullName := include "chart-with-template-lib-dep.fullname" . -}}
+{{- $ingressPath := .Values.ingress.path -}}
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: {{ $fullName }}
+  labels:
+    app: {{ template "chart-with-template-lib-dep.name" . }}
+    chart: {{ template "chart-with-template-lib-dep.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+{{- with .Values.ingress.annotations }}
+  annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
+spec:
+{{- if .Values.ingress.tls }}
+  tls:
+  {{- range .Values.ingress.tls }}
+    - hosts:
+      {{- range .hosts }}
+        - {{ . }}
+      {{- end }}
+      secretName: {{ .secretName }}
+  {{- end }}
+{{- end }}
+  rules:
+  {{- range .Values.ingress.hosts }}
+    - host: {{ . }}
+      http:
+        paths:
+          - path: {{ $ingressPath }}
+            backend:
+              serviceName: {{ $fullName }}
+              servicePort: http
+  {{- end }}
+{{- end }}
diff --git a/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/templates/service.yaml b/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/templates/service.yaml
new file mode 100644
index 000000000..d532bb3d8
--- /dev/null
+++ b/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/templates/service.yaml
@@ -0,0 +1,10 @@
+{{- template "common.service" (list . "chart-with-template-lib-dep.service") -}}
+{{- define "chart-with-template-lib-dep.service" -}}
+## Define overrides for your Service resource here, e.g.
+# metadata:
+#   labels:
+#     custom: label
+# spec:
+#   ports:
+#   - port: 8080
+{{- end -}}
diff --git a/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/values.yaml b/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/values.yaml
new file mode 100644
index 000000000..d49955c26
--- /dev/null
+++ b/cmd/helm/testdata/testcharts/chart-with-template-lib-dep/values.yaml
@@ -0,0 +1,48 @@
+# Default values for chart-with-template-lib-dep.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+replicaCount: 1
+
+image:
+  repository: nginx
+  tag: stable
+  pullPolicy: IfNotPresent
+
+nameOverride: ""
+fullnameOverride: ""
+
+service:
+  type: ClusterIP
+  port: 80
+
+ingress:
+  enabled: false
+  annotations: {}
+    # kubernetes.io/ingress.class: nginx
+    # kubernetes.io/tls-acme: "true"
+  path: /
+  hosts:
+    - chart-example.local
+  tls: []
+  #  - secretName: chart-example-tls
+  #    hosts:
+  #      - chart-example.local
+
+resources: {}
+  # We usually recommend not to specify default resources and to leave this as a conscious
+  # choice for the user. This also increases chances charts run on environments with little
+  # resources, such as Minikube. If you do want to specify resources, uncomment the following
+  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+  # limits:
+  #  cpu: 100m
+  #  memory: 128Mi
+  # requests:
+  #  cpu: 100m
+  #  memory: 128Mi
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
diff --git a/docs/charts.md b/docs/charts.md
index 442269e55..2a53dbb74 100644
--- a/docs/charts.md
+++ b/docs/charts.md
@@ -128,6 +128,10 @@ provides utilities or functions for the chart builder. A library chart differs
 from an application chart because it has no resource object and is therefore not
 installable.
 
+**Note:** An application chart can be used as a library chart. This is enabled by setting the
+type to `library`. The chart will then be rendered as a library chart where all utilities and
+functions can be leveraged. All resource objects of the chart will not be rendered.
+
 ## Chart LICENSE, README and NOTES
 
 Charts can also contain files that describe the installation, configuration, usage and license of a
diff --git a/pkg/chart/loader/archive.go b/pkg/chart/loader/archive.go
index a8dc3f17b..71a111235 100644
--- a/pkg/chart/loader/archive.go
+++ b/pkg/chart/loader/archive.go
@@ -51,11 +51,30 @@ func LoadFile(name string) (*chart.Chart, error) {
 	}
 	defer raw.Close()
 
-	return LoadArchive(raw)
+	isLibChart, err := IsArchiveLibraryChart(raw)
+	if err != nil {
+		return nil, err
+	}
+	_, _ = raw.Seek(0, 0)
+	return LoadArchive(raw, isLibChart)
+}
+
+// IsArchiveLibraryChart return true if it is a library chart
+func IsArchiveLibraryChart(in io.Reader) (bool, error) {
+	var isLibChart = false
+	_, err := traverse(in, false, &isLibChart)
+	if err != nil {
+		return false, err
+	}
+	return isLibChart, nil
 }
 
 // LoadArchive loads from a reader containing a compressed tar archive.
-func LoadArchive(in io.Reader) (*chart.Chart, error) {
+func LoadArchive(in io.Reader, isLibChart bool) (*chart.Chart, error) {
+	return traverse(in, true, &isLibChart)
+}
+
+func traverse(in io.Reader, loadFiles bool, isLibChart *bool) (*chart.Chart, error) {
 	unzipped, err := gzip.NewReader(in)
 	if err != nil {
 		return &chart.Chart{}, err
@@ -100,13 +119,29 @@ func LoadArchive(in io.Reader) (*chart.Chart, error) {
 			return &chart.Chart{}, err
 		}
 
-		files = append(files, &BufferedFile{Name: n, Data: b.Bytes()})
+		if !loadFiles && n == "Chart.yaml" {
+			var err error
+			*isLibChart, err = IsLibraryChart(b.Bytes())
+			if err != nil {
+				return nil, errors.Wrapf(err, "cannot load Chart.yaml")
+			}
+			return nil, nil
+		}
+
+		if IsFileValid(n, *isLibChart) {
+			files = append(files, &BufferedFile{Name: n, Data: b.Bytes()})
+		}
+
 		b.Reset()
 	}
 
-	if len(files) == 0 {
+	if loadFiles && len(files) == 0 {
 		return nil, errors.New("no files in chart archive")
 	}
 
+	if !loadFiles {
+		return nil, errors.New("cannot find the chart type")
+	}
+
 	return LoadFiles(files)
 }
diff --git a/pkg/chart/loader/load.go b/pkg/chart/loader/load.go
index cd886d8c7..6c78b7964 100644
--- a/pkg/chart/loader/load.go
+++ b/pkg/chart/loader/load.go
@@ -124,8 +124,30 @@ func LoadFiles(files []*BufferedFile) (*chart.Chart, error) {
 				return c, errors.Errorf("error unpacking tar in %s: expected %s, got %s", c.Name(), n, file.Name)
 			}
 			// Untar the chart and add to c.Dependencies
-			sc, err = LoadArchive(bytes.NewBuffer(file.Data))
+			var isLibChart bool
+			isLibChart, err = IsArchiveLibraryChart(bytes.NewBuffer(file.Data))
+			if err == nil {
+				sc, err = LoadArchive(bytes.NewBuffer(file.Data), isLibChart)
+			}
 		default:
+			// Need to ascertain if the subchart is a library chart as will parse files
+			// differently from a standard application chart
+			var isLibChart = false
+			for _, f := range files {
+				parts := strings.SplitN(f.Name, "/", 2)
+				if len(parts) < 2 {
+					continue
+				}
+				name := parts[1]
+				if name == "Chart.yaml" {
+					isLibChart, err = IsLibraryChart(f.Data)
+					if err != nil {
+						return c, errors.Wrapf(err, "cannot load Chart.yaml for %s in %s", n, c.Name())
+					}
+					break
+				}
+			}
+
 			// We have to trim the prefix off of every file, and ignore any file
 			// that is in charts/, but isn't actually a chart.
 			buff := make([]*BufferedFile, 0, len(files))
@@ -135,7 +157,12 @@ func LoadFiles(files []*BufferedFile) (*chart.Chart, error) {
 					continue
 				}
 				f.Name = parts[1]
-				buff = append(buff, f)
+
+				// If the subchart is a library chart then will only want
+				// to render library and value files, and not any included template files
+				if IsFileValid(f.Name, isLibChart) {
+					buff = append(buff, f)
+				}
 			}
 			sc, err = LoadFiles(buff)
 		}
@@ -143,8 +170,34 @@ func LoadFiles(files []*BufferedFile) (*chart.Chart, error) {
 		if err != nil {
 			return c, errors.Wrapf(err, "error unpacking %s in %s", n, c.Name())
 		}
+
 		c.AddDependency(sc)
 	}
 
 	return c, nil
 }
+
+// IsLibraryChart return true if it is a library chart
+func IsLibraryChart(data []byte) (bool, error) {
+	var isLibChart = false
+	metadata := new(chart.Metadata)
+	if err := yaml.Unmarshal(data, metadata); err != nil {
+		return false, errors.Wrapf(err, "cannot load data")
+	}
+	if strings.EqualFold(metadata.Type, "library") {
+		isLibChart = true
+	}
+	return isLibChart, nil
+}
+
+// IsFileValid return true if this file is valid for library or
+//  application chart
+func IsFileValid(filename string, isLibChart bool) bool {
+	if isLibChart {
+		if strings.HasPrefix(filepath.Base(filename), "_") || !strings.HasPrefix(filepath.Dir(filename), "template") {
+			return true
+		}
+		return false
+	}
+	return true
+}
diff --git a/pkg/registry/cache.go b/pkg/registry/cache.go
index 39dec1467..cd5d0a203 100644
--- a/pkg/registry/cache.go
+++ b/pkg/registry/cache.go
@@ -85,7 +85,7 @@ func (cache *filesystemCache) LayersToChart(layers []ocispec.Descriptor) (*chart
 	}
 
 	// Construct chart object and attach metadata
-	ch, err := loader.LoadArchive(bytes.NewBuffer(contentRaw))
+	ch, err := loader.LoadArchive(bytes.NewBuffer(contentRaw), false)
 	if err != nil {
 		return nil, err
 	}