PackageManifests should include CSV Metadata

Problem:
Although CSVs allow users to define keywords for their operators, these
keywords are not available in the PackageManifest created for the
operator.

Solution:
Copy the keywords, links, maintainers, and maturity from the CSV to the
PackageManifest.

Author: awgreene

pkg/package-server/apis/operators/packagemanifest.go

@@ -22,6 +22,8 @@ func CreateCSVDescription(csv *operatorsv1alpha1.ClusterServiceVersion) CSVDescr
 			Owned:    descriptionsForAPIServices(csv.Spec.APIServiceDefinitions.Owned),
 			Required: descriptionsForAPIServices(csv.Spec.APIServiceDefinitions.Required),
 		},
+		Keywords: csv.Spec.Keywords,
+		Maturity: csv.Spec.Maturity,
 	}
 
 	icons := make([]Icon, len(csv.Spec.Icon))
@@ -36,6 +38,22 @@ func CreateCSVDescription(csv *operatorsv1alpha1.ClusterServiceVersion) CSVDescr
 		desc.Icon = icons
 	}
 
+	desc.Links = make([]AppLink, len(csv.Spec.Links))
+	for i, link := range csv.Spec.Links {
+		desc.Links[i] = AppLink{
+			Name: link.Name,
+			URL:  link.URL,
+		}
+	}
+
+	desc.Maintainers = make([]Maintainer, len(csv.Spec.Maintainers))
+	for i, maintainer := range csv.Spec.Maintainers {
+		desc.Maintainers[i] = Maintainer{
+			Name:  maintainer.Name,
+			Email: maintainer.Email,
+		}
+	}
+
 	return desc
 }
 

pkg/package-server/apis/operators/packagemanifest_types.go

@@ -96,6 +96,10 @@ type CSVDescription struct {
 	// Provider is the CSV's provider
 	Provider    AppLink
 	Annotations map[string]string
+	Keywords    []string
+	Links       []AppLink
+	Maintainers []Maintainer
+	Maturity    string
 
 	// LongDescription is the CSV's description
 	LongDescription string
@@ -113,6 +117,12 @@ type AppLink struct {
 	URL  string
 }
 
+// Maintainer defines a project maintainer
+type Maintainer struct {
+	Name  string `json:"name,omitempty"`
+	Email string `json:"email,omitempty"`
+}
+
 // Icon defines a base64 encoded icon and media type
 type Icon struct {
 	Base64Data string

pkg/package-server/apis/operators/v1/packagemanifest.go

@@ -16,6 +16,8 @@ func CreateCSVDescription(csv *operatorsv1alpha1.ClusterServiceVersion) CSVDescr
 		InstallModes:              csv.Spec.InstallModes,
 		CustomResourceDefinitions: csv.Spec.CustomResourceDefinitions,
 		APIServiceDefinitions:     csv.Spec.APIServiceDefinitions,
+		Keywords:                  csv.Spec.Keywords,
+		Maturity:                  csv.Spec.Maturity,
 	}
 
 	icons := make([]Icon, len(csv.Spec.Icon))
@@ -30,5 +32,21 @@ func CreateCSVDescription(csv *operatorsv1alpha1.ClusterServiceVersion) CSVDescr
 		desc.Icon = icons
 	}
 
+	desc.Links = make([]AppLink, len(csv.Spec.Links))
+	for i, link := range csv.Spec.Links {
+		desc.Links[i] = AppLink{
+			Name: link.Name,
+			URL:  link.URL,
+		}
+	}
+
+	desc.Maintainers = make([]Maintainer, len(csv.Spec.Maintainers))
+	for i, maintainer := range csv.Spec.Maintainers {
+		desc.Maintainers[i] = Maintainer{
+			Name:  maintainer.Name,
+			Email: maintainer.Email,
+		}
+	}
+
 	return desc
 }

pkg/package-server/apis/operators/v1/packagemanifest_types.go

@@ -96,6 +96,13 @@ type CSVDescription struct {
 	// Provider is the CSV's provider
 	Provider    AppLink           `json:"provider,omitempty"`
 	Annotations map[string]string `json:"annotations,omitempty"`
+	// +listType=set
+	Keywords []string `json:"keywords,omitempty"`
+	// +listType=set
+	Links []AppLink `json:"links,omitempty"`
+	// +listType=set
+	Maintainers []Maintainer `json:"maintainers,omitempty"`
+	Maturity    string       `json:"maturity,omitempty"`
 
 	// LongDescription is the CSV's description
 	LongDescription string `json:"description,omitempty"`
@@ -113,6 +120,12 @@ type AppLink struct {
 	URL  string `json:"url,omitempty"`
 }
 
+// Maintainer defines a project maintainer
+type Maintainer struct {
+	Name  string `json:"name,omitempty"`
+	Email string `json:"email,omitempty"`
+}
+
 // Icon defines a base64 encoded icon and media type
 type Icon struct {
 	Base64Data string `json:"base64data,omitempty"`