From 86fe388283c8962bc96a11f052677fb5b3d3ee6f Mon Sep 17 00:00:00 2001 From: Dave Cunningham Date: Wed, 16 Mar 2016 17:07:22 -0400 Subject: [PATCH] Also remove the Name field from templates, as the name in the resource suffices --- cmd/dm/dm.go | 2 +- pkg/common/types.go | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/cmd/dm/dm.go b/cmd/dm/dm.go index 9b7480f5f..8a281a42b 100644 --- a/cmd/dm/dm.go +++ b/cmd/dm/dm.go @@ -414,7 +414,7 @@ func buildTemplateFromType(t string) *common.Template { func marshalTemplate(template *common.Template) io.ReadCloser { j, err := json.Marshal(template) if err != nil { - panic(fmt.Errorf("cannot deploy configuration %s: %s\n", template.Name, err)) + panic(fmt.Errorf("cannot deploy %s: %s\n", template.ChartInvocation.Name, err)) } return ioutil.NopCloser(bytes.NewReader(j)) diff --git a/pkg/common/types.go b/pkg/common/types.go index 717ddaf05..782af2995 100644 --- a/pkg/common/types.go +++ b/pkg/common/types.go @@ -118,7 +118,6 @@ type Chart struct { // Manager expands a Template into a Configuration, which // describes the set in a form that can be instantiated. type Template struct { - Name string `json:"name"` ChartInvocation *Resource `json:"content"` Chart Chart `json:"chart"` }