Update after review

- https://github.com/helm/helm/pull/4524#pullrequestreview-155183390
- https://github.com/helm/helm/pull/4524#pullrequestreview-155379922
- Fix where app.kubernetes.io/instance was incorrect in service selector

Signed-off-by: Martin Hickey <martin.hickey@ie.ibm.com>

cmd/helm/create.go

@@ -38,15 +38,17 @@ something like this:
 
 	foo/
 	  |
-	  |- .helmignore   # Contains patterns to ignore when packaging Helm charts.
+	  |- .helmignore        # Contains patterns to ignore when packaging Helm charts.
 	  |
-	  |- Chart.yaml    # Information about your chart
+	  |- Chart.yaml         # Information about your chart
 	  |
-	  |- values.yaml   # The default values for your templates
+	  |- values.yaml        # The default values for your templates
 	  |
-	  |- charts/       # Charts that this chart depends on
+	  |- charts/            # Charts that this chart depends on
 	  |
-	  |- templates/    # The template files
+	  |- templates/         # The template files
+	  |
+	  |- templates/tests/   # The test files
 
 'helm create' takes a path for an argument. If directories in the given path
 do not exist, Helm will attempt to create them as it goes. If the given
@@ -84,7 +86,6 @@ func newCreateCmd(out io.Writer) *cobra.Command {
 
 func (c *createCmd) run() error {
 	fmt.Fprintf(c.out, "Creating %s\n", c.name)
-
 	chartname := filepath.Base(c.name)
 	cfile := &chart.Metadata{
 		Name:        chartname,

pkg/chartutil/create.go

@@ -46,8 +46,10 @@ const (
 	NotesName = "NOTES.txt"
 	// HelpersName is the name of the example helpers file.
 	HelpersName = "_helpers.tpl"
-	// ServiceTestName is the name of the example test service file.
-	ServiceTestName = "service-test.yaml"
+	// TemplatesTestsDir is the relative directory name for templates tests.
+	TemplatesTestsDir = "templates/tests"
+	// TestConnectionName is the name of the example connection test file.
+	TestConnectionName = "test-connection.yaml"
 )
 
 const defaultValues = `# Default values for %s.
@@ -292,23 +294,23 @@ Create chart name and version as used by the chart label.
 {{- end -}}
 `
 
-const defaultServiceTest = `apiVersion: v1
+const defaultTestConnection = `apiVersion: v1
 kind: Pod
 metadata:
-  name: "{{ template "<CHARTNAME>.fullname" . }}-service-test"
+  name: "{{ include "<CHARTNAME>.fullname" . }}-test-connection"
   labels:
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    app: {{ template "<CHARTNAME>.name" . }}
+    app.kubernetes.io/name: {{ include "<CHARTNAME>.name" . }}
+    helm.sh/chart: {{ include "<CHARTNAME>.chart" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
   annotations:
     "helm.sh/hook": test-success
 spec:
   containers:
-    - name: curl
-      image: radial/busyboxplus:curl
-      command: ['curl']
-      args:  ['{{ template "<CHARTNAME>.fullname" . }}:{{ .Values.service.port }}']
+    - name: wget
+      image: busybox
+      command: ['wget']
+      args:  ['{{ include "<CHARTNAME>.fullname" . }}:{{ .Values.service.port }}']
   restartPolicy: Never
 `
 
@@ -376,7 +378,7 @@ func Create(chartfile *chart.Metadata, dir string) (string, error) {
 		}
 	}
 
-	for _, d := range []string{TemplatesDir, ChartsDir} {
+	for _, d := range []string{TemplatesDir, TemplatesTestsDir, ChartsDir} {
 		if err := os.MkdirAll(filepath.Join(cdir, d), 0755); err != nil {
 			return cdir, err
 		}
@@ -422,9 +424,9 @@ func Create(chartfile *chart.Metadata, dir string) (string, error) {
 			content: Transform(defaultHelpers, "<CHARTNAME>", chartfile.Name),
 		},
 		{
-			// service-test.yaml
-			path:    filepath.Join(cdir, TemplatesDir, ServiceTestName),
-			content: Transform(defaultServiceTest, "<CHARTNAME>", chartfile.Name),
+			// test-connection.yaml
+			path:    filepath.Join(cdir, TemplatesTestsDir, TestConnectionName),
+			content: Transform(defaultTestConnection, "<CHARTNAME>", chartfile.Name),
 		},
 	}
 

pkg/chartutil/create_test.go

@@ -67,7 +67,7 @@ func TestCreate(t *testing.T) {
 		}
 	}
 
-	for _, f := range []string{NotesName, DeploymentName, ServiceName, HelpersName, ServiceTestName} {
+	for _, f := range []string{NotesName, DeploymentName, ServiceName, HelpersName} {
 		if fi, err := os.Stat(filepath.Join(dir, TemplatesDir, f)); err != nil {
 			t.Errorf("Expected %s file: %s", f, err)
 		} else if fi.IsDir() {
@@ -75,6 +75,14 @@ func TestCreate(t *testing.T) {
 		}
 	}
 
+	for _, f := range []string{TestConnectionName} {
+		if fi, err := os.Stat(filepath.Join(dir, TemplatesTestsDir, f)); err != nil {
+			t.Errorf("Expected %s file: %s", f, err)
+		} else if fi.IsDir() {
+			t.Errorf("Expected %s to be a file.", f)
+		}
+	}
+
 }
 
 func TestCreateFrom(t *testing.T) {

pkg/chartutil/save.go

@@ -54,7 +54,7 @@ func SaveDir(c *chart.Chart, dest string) error {
 		}
 	}
 
-	for _, d := range []string{TemplatesDir, ChartsDir} {
+	for _, d := range []string{TemplatesDir, ChartsDir, TemplatesTestsDir} {
 		if err := os.MkdirAll(filepath.Join(outdir, d), 0755); err != nil {
 			return err
 		}

pkg/urlutil/urlutil_test.go

@@ -65,8 +65,8 @@ func TestEqual(t *testing.T) {
 
 func TestExtractHostname(t *testing.T) {
 	tests := map[string]string{
-		"http://example.com":      "example.com",
-		"https://example.com/foo": "example.com",
+		"http://example.com":                                      "example.com",
+		"https://example.com/foo":                                 "example.com",
 		"https://example.com:31337/not/with/a/bang/but/a/whimper": "example.com",
 	}
 	for start, expect := range tests {