Merge 99842d3e2a into c6df39597c

cmd/helm/template.go

@@ -165,7 +165,8 @@ func (o *templateOptions) run(out io.Writer) error {
 		return errors.Wrap(err, "cannot load requirements")
 	}
 	options := chartutil.ReleaseOptions{
-		Name: o.releaseName,
+		Name:      o.releaseName,
+		Namespace: getNamespace(),
 	}
 
 	if err := chartutil.ProcessRequirementsEnabled(c, config); err != nil {

cmd/helm/testdata/output/template-absolute.txt

@@ -6,6 +6,7 @@ metadata:
   name: subchart1
   labels:
     chart: "subchart1-0.1.0"
+    namespace: "default"
     release-name: "RELEASE-NAME"
     kube-version/major: "1"
     kube-version/minor: "9"

cmd/helm/testdata/output/template-kube-version.txt

@@ -42,6 +42,7 @@ metadata:
   name: subchart1
   labels:
     chart: "subchart1-0.1.0"
+    namespace: "default"
     release-name: "RELEASE-NAME"
     kube-version/major: "1"
     kube-version/minor: "6"

cmd/helm/testdata/output/template-name-template.txt

@@ -42,6 +42,7 @@ metadata:
   name: subchart1
   labels:
     chart: "subchart1-0.1.0"
+    namespace: "default"
     release-name: "foobar-YWJj-baz"
     kube-version/major: "1"
     kube-version/minor: "9"

cmd/helm/testdata/output/template-name.txt

@@ -42,6 +42,7 @@ metadata:
   name: subchart1
   labels:
     chart: "subchart1-0.1.0"
+    namespace: "default"
     release-name: "test"
     kube-version/major: "1"
     kube-version/minor: "9"

cmd/helm/testdata/output/template-notes.txt

@@ -42,6 +42,7 @@ metadata:
   name: subchart1
   labels:
     chart: "subchart1-0.1.0"
+    namespace: "default"
     release-name: "RELEASE-NAME"
     kube-version/major: "1"
     kube-version/minor: "9"

cmd/helm/testdata/output/template-set.txt

@@ -6,6 +6,7 @@ metadata:
   name: subchart1
   labels:
     chart: "subchart1-0.1.0"
+    namespace: "default"
     release-name: "RELEASE-NAME"
     kube-version/major: "1"
     kube-version/minor: "9"

cmd/helm/testdata/output/template-values-files.txt

@@ -42,6 +42,7 @@ metadata:
   name: subchart1
   labels:
     chart: "subchart1-0.1.0"
+    namespace: "default"
     release-name: "RELEASE-NAME"
     kube-version/major: "1"
     kube-version/minor: "9"

cmd/helm/testdata/output/template.txt

@@ -42,6 +42,7 @@ metadata:
   name: subchart1
   labels:
     chart: "subchart1-0.1.0"
+    namespace: "default"
     release-name: "RELEASE-NAME"
     kube-version/major: "1"
     kube-version/minor: "9"

docs/chart_template_guide/builtin_objects.md

@@ -8,6 +8,7 @@ In the previous section, we use `{{.Release.Name}}` to insert the name of a rele
 
 - `Release`: This object describes the release itself. It has several objects inside of it:
   - `Release.Name`: The release name
+  - `Release.Namespace`: The namespace to be released into (if the manifest doesn't override)
   - `Release.Service`: The name of the releasing service (always `Tiller`).
   - `Release.IsUpgrade`: This is set to `true` if the current operation is an upgrade or rollback.
   - `Release.IsInstall`: This is set to `true` if the current operation is an install.

docs/charts.md

@@ -574,6 +574,7 @@ cannot be overridden. As with all values, the names are _case
 sensitive_.
 
 - `Release.Name`: The name of the release (not the chart)
+- `Release.Namespace`: The namespace the chart was released to.
 - `Release.Service`: The service that conducted the release. Usually
   this is `Tiller`.
 - `Release.IsUpgrade`: This is set to true if the current operation is an upgrade or rollback.

pkg/chartutil/create.go

@@ -243,16 +243,16 @@ const defaultNotes = `1. Get the application URL by running these commands:
   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 "<CHARTNAME>.fullname" . }})
+  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "<CHARTNAME>.fullname" . }})
-  export NODE_IP=$(kubectl get nodes -o jsonpath="{.items[0].status.addresses[0].address}")
+  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -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 "<CHARTNAME>.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc {{ template "<CHARTNAME>.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "<CHARTNAME>.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 "<CHARTNAME>.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "<CHARTNAME>.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 }}

pkg/chartutil/testdata/subpop/charts/subchart1/templates/service.yaml

@@ -4,6 +4,7 @@ metadata:
   name: {{ .Chart.Name }}
   labels:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    namespace: "{{ .Release.Namespace }}"
     release-name: "{{ .Release.Name }}"
     kube-version/major: "{{ .Capabilities.KubeVersion.Major }}"
     kube-version/minor: "{{ .Capabilities.KubeVersion.Minor }}"

pkg/chartutil/values.go

@@ -17,14 +17,13 @@ limitations under the License.
 package chartutil
 
 import (
+	"github.com/ghodss/yaml"
+	"github.com/pkg/errors"
 	"io"
 	"io/ioutil"
 	"log"
 	"strings"
 
-	"github.com/ghodss/yaml"
-	"github.com/pkg/errors"
-
 	"k8s.io/helm/pkg/hapi/chart"
 )
 
@@ -334,6 +333,7 @@ func coalesceTables(dst, src map[string]interface{}) map[string]interface{} {
 // for the composition of the final values struct
 type ReleaseOptions struct {
 	Name      string
+	Namespace string
 	IsUpgrade bool
 	IsInstall bool
 }
@@ -357,6 +357,7 @@ func ToRenderValuesCaps(chrt *chart.Chart, chrtVals []byte, options ReleaseOptio
 	top := map[string]interface{}{
 		"Release": map[string]interface{}{
 			"Name":      options.Name,
+			"Namespace": options.Namespace,
 			"IsUpgrade": options.IsUpgrade,
 			"IsInstall": options.IsInstall,
 			"Service":   "Helm",

pkg/chartutil/values_test.go

@@ -103,6 +103,7 @@ where:
 
 	o := ReleaseOptions{
 		Name:      "Seven Voyages",
+		Namespace: "al Basrah",
 		IsInstall: true,
 	}
 

pkg/lint/rules/template.go

@@ -50,7 +50,7 @@ func Templates(linter *support.Linter, values []byte, namespace string, strict b
 		return
 	}
 
-	options := chartutil.ReleaseOptions{Name: "testRelease"}
+	options := chartutil.ReleaseOptions{Name: "testRelease", Namespace: namespace}
 	caps := &chartutil.Capabilities{
 		APIVersions: chartutil.DefaultVersionSet,
 		KubeVersion: chartutil.DefaultKubeVersion,

pkg/tiller/release_install.go

@@ -69,6 +69,7 @@ func (s *ReleaseServer) prepareRelease(req *hapi.InstallReleaseRequest) (*releas
 	ts := time.Now()
 	options := chartutil.ReleaseOptions{
 		Name:      name,
+		Namespace: req.Namespace,
 		IsInstall: true,
 	}
 	valuesToRender, err := chartutil.ToRenderValuesCaps(req.Chart, req.Values, options, caps)

pkg/tiller/release_update.go

@@ -98,6 +98,7 @@ func (s *ReleaseServer) prepareUpdate(req *hapi.UpdateReleaseRequest) (*release.
 	ts := time.Now()
 	options := chartutil.ReleaseOptions{
 		Name:      req.Name,
+		Namespace: currentRelease.Namespace,
 		IsUpgrade: true,
 	}