Merge pull request #41 from mnottale/metadata-remove-tag-labels

mnottale · web-flow · commit 0d7a456a6c6b · 2018-04-25T15:57:27.000+02:00
Remove tag and labels from metadata.
diff --git a/e2e/render/envvariables.docker-app/metadata.yml b/e2e/render/envvariables.docker-app/metadata.yml
@@ -1,9 +1,6 @@
 version: 0.1.0
 name: myapp
 description: ""
-tag: ""
-labels:
-- alpha
 author: bearclaw
 targets:
   swarm: true
diff --git a/e2e/render/templates.docker-app/metadata.yml b/e2e/render/templates.docker-app/metadata.yml
@@ -1,9 +1,6 @@
 version: 0.1.0
 name: myapp
 description: ""
-tag: ""
-labels:
-- alpha
 author: bearclaw
 targets:
   swarm: true
diff --git a/examples/simple/README.md b/examples/simple/README.md
@@ -139,9 +139,6 @@ services:
 version: 0.1.0
 name: simple
 description: ""
-tag: ""
-labels:
-- alpha
 author: sakuya.izayoi
 targets:
   swarm: true
diff --git a/examples/simple/simple.docker-app/metadata.yml b/examples/simple/simple.docker-app/metadata.yml
@@ -2,9 +2,6 @@ version: 0.1.0
 application:
   name: simple
   description: ""
-  tag: ""
-  labels:
-  - alpha
   author: sakuya.izayoi
 targets:
   swarm: true
diff --git a/packager/init.go b/packager/init.go
@@ -212,7 +212,6 @@ func newMetadata(name string) types.AppMetadata {
 		Version: "0.1.0",
 		Targets: target,
 		Name:    name,
-		Labels:  []string{"alpha"},
 		Author:  userName,
 	}
 }
diff --git a/renderer/helm.go b/renderer/helm.go
@@ -31,7 +31,6 @@ func toHelmMeta(meta *types.AppMetadata) (*helmMeta, error) {
 		Name:        meta.Name,
 		Version:     meta.Version,
 		Description: meta.Description,
-		Keywords:    meta.Labels,
 		Maintainers: []helmMaintainer{{Name: meta.Author}},
 	}, nil
 }
diff --git a/types/metadata.go b/types/metadata.go
@@ -5,8 +5,6 @@ type AppMetadata struct {
 	Version     string
 	Name        string
 	Description string
-	Tag         string
-	Labels      []string
 	Author      string
 	Targets     ApplicationTarget
 }

Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,6 @@ func newMetadata(name string) types.AppMetadata {`
`212`	`212`	`Version: "0.1.0",`
`213`	`213`	`Targets: target,`
`214`	`214`	`Name: name,`
`215`		`- Labels: []string{"alpha"},`
`216`	`215`	`Author: userName,`
`217`	`216`	`}`
`218`	`217`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,6 @@ func toHelmMeta(meta types.AppMetadata) (helmMeta, error) {`
`31`	`31`	`Name: meta.Name,`
`32`	`32`	`Version: meta.Version,`
`33`	`33`	`Description: meta.Description,`
`34`		`- Keywords: meta.Labels,`
`35`	`34`	`Maintainers: []helmMaintainer{{Name: meta.Author}},`
`36`	`35`	`}, nil`
`37`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,6 @@ type AppMetadata struct {`
`5`	`5`	`Version string`
`6`	`6`	`Name string`
`7`	`7`	`Description string`
`8`		`- Tag string`
`9`		`- Labels []string`
`10`	`8`	`Author string`
`11`	`9`	`Targets ApplicationTarget`
`12`	`10`	`}`