Skip to content

Commit

Permalink
Merge pull request #2298 from flant/fix_extra_annotations_and_labels
Browse files Browse the repository at this point in the history
Fix extra annotations/labels are not added to k8s resources
  • Loading branch information
distorhead committed Mar 30, 2020
2 parents 54f8307 + 8dfe117 commit 46c847a
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions pkg/deploy/helm/templates.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ func (templates ChartTemplates) ByKind(kind string) []Template {
}

type Template struct {
Version string `yaml:"apiVersion,omitempty"`
Kind string `yaml:"kind,omitempty"`
Metadata struct {
ApiVersion string `yaml:"apiVersion,omitempty"`
Kind string `yaml:"kind,omitempty"`
Metadata struct {
Name string `yaml:"name,omitempty"`
Namespace string `yaml:"namespace,omitempty"`
Annotations map[string]string `yaml:"annotations,omitempty"`
Expand All @@ -76,7 +76,7 @@ func (t Template) Namespace(namespace string) string {
}

func (t Template) IsEmpty() bool {
if t.Version == "" || t.Kind == "" {
if t.ApiVersion == "" || t.Kind == "" {
return true
}

Expand Down

0 comments on commit 46c847a

Please sign in to comment.