Merge pull request #1520 from awgreene/packagemanifests-keywords

Bug 1812019: PackageManifests should include Keywords

Author: openshift-merge-robot

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

@@ -35,6 +35,8 @@ func CreateCSVDescription(csv *operatorsv1alpha1.ClusterServiceVersion, csvJSON
 		NativeAPIs:     csv.Spec.NativeAPIs,
 		MinKubeVersion: csv.Spec.MinKubeVersion,
 		RelatedImages:  GetImages(csvJSON),
+		Keywords:       csv.Spec.Keywords,
+		Maturity:       csv.Spec.Maturity,
 	}
 
 	icons := make([]Icon, len(csv.Spec.Icon))
@@ -49,6 +51,22 @@ func CreateCSVDescription(csv *operatorsv1alpha1.ClusterServiceVersion, csvJSON
 		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

@@ -98,6 +98,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
@@ -122,6 +126,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

@@ -29,6 +29,8 @@ func CreateCSVDescription(csv *operatorsv1alpha1.ClusterServiceVersion, csvJSON
 		NativeAPIs:                csv.Spec.NativeAPIs,
 		MinKubeVersion:            csv.Spec.MinKubeVersion,
 		RelatedImages:             GetImages(csvJSON),
+		Keywords:                  csv.Spec.Keywords,
+		Maturity:                  csv.Spec.Maturity,
 	}
 
 	icons := make([]Icon, len(csv.Spec.Icon))
@@ -43,6 +45,22 @@ func CreateCSVDescription(csv *operatorsv1alpha1.ClusterServiceVersion, csvJSON
 		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

@@ -99,6 +99,13 @@ type CSVDescription struct {
 	Provider AppLink `json:"provider,omitempty"`
 	// +listType=map
 	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"`
@@ -124,6 +131,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"`