Merge pull request #521 from alecmerdler/ALM-774

openshift-merge-robot · web-flow · commit 532155da3a1d · 2018-10-16T11:58:30.000-07:00
Pass Annotations to PackageManifests
diff --git a/pkg/package-server/apis/packagemanifest/v1alpha1/packagemanifest.go b/pkg/package-server/apis/packagemanifest/v1alpha1/packagemanifest.go
@@ -11,6 +11,7 @@ func CreateCSVDescription(csv *operatorsv1alpha1.ClusterServiceVersion) CSVDescr
 			Name: csv.Spec.Provider.Name,
 			URL:  csv.Spec.Provider.URL,
 		},
+		Annotations: csv.GetAnnotations(),
 	}
 
 	icons := make([]Icon, len(csv.Spec.Icon))
diff --git a/pkg/package-server/apis/packagemanifest/v1alpha1/packagemanifest_types.go b/pkg/package-server/apis/packagemanifest/v1alpha1/packagemanifest_types.go
@@ -93,7 +93,8 @@ type CSVDescription struct {
 	Version semver.Version `json:"version,omitempty"`
 
 	// Provider is the CSV's provider
-	Provider AppLink `json:"provider,omitempty"`
+	Provider    AppLink           `json:"provider,omitempty"`
+	Annotations map[string]string `json:"annotations,omitempty"`
 }
 
 // AppLink defines a link to an application
diff --git a/pkg/package-server/apis/packagemanifest/v1alpha1/zz_generated.deepcopy.go b/pkg/package-server/apis/packagemanifest/v1alpha1/zz_generated.deepcopy.go

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ func CreateCSVDescription(csv *operatorsv1alpha1.ClusterServiceVersion) CSVDescr`
`11`	`11`	`Name: csv.Spec.Provider.Name,`
`12`	`12`	`URL: csv.Spec.Provider.URL,`
`13`	`13`	`},`
	`14`	`+ Annotations: csv.GetAnnotations(),`
`14`	`15`	`}`
`15`	`16`
`16`	`17`	`icons := make([]Icon, len(csv.Spec.Icon))`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,8 @@ type CSVDescription struct {`
`93`	`93`	Version semver.Version `json:"version,omitempty"`
`94`	`94`
`95`	`95`	`// Provider is the CSV's provider`
`96`		- Provider AppLink `json:"provider,omitempty"`
	`96`	+ Provider AppLink `json:"provider,omitempty"`
	`97`	+ Annotations map[string]string `json:"annotations,omitempty"`
`97`	`98`	`}`
`98`	`99`
`99`	`100`	`// AppLink defines a link to an application`