Merge pull request #1387 from dinhxuanvu/pkgm-csv

Add more CSV information to the PackageManifest

Author: openshift-merge-robot

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

@@ -1,9 +1,19 @@
 package operators
 
-import operatorsv1alpha1 "github.com/operator-framework/operator-lifecycle-manager/pkg/api/apis/operators/v1alpha1"
+import (
+	"encoding/json"
+
+	operatorsv1alpha1 "github.com/operator-framework/operator-lifecycle-manager/pkg/api/apis/operators/v1alpha1"
+	"github.com/operator-framework/operator-registry/pkg/registry"
+)
+
+const (
+	// The yaml attribute that specifies the related images of the ClusterServiceVersion
+	relatedImages = "relatedImages"
+)
 
 // CreateCSVDescription creates a CSVDescription from a given CSV
-func CreateCSVDescription(csv *operatorsv1alpha1.ClusterServiceVersion) CSVDescription {
+func CreateCSVDescription(csv *operatorsv1alpha1.ClusterServiceVersion, csvJSON string) CSVDescription {
 	desc := CSVDescription{
 		DisplayName: csv.Spec.DisplayName,
 		Version:     csv.Spec.Version,
@@ -22,6 +32,9 @@ func CreateCSVDescription(csv *operatorsv1alpha1.ClusterServiceVersion) CSVDescr
 			Owned:    descriptionsForAPIServices(csv.Spec.APIServiceDefinitions.Owned),
 			Required: descriptionsForAPIServices(csv.Spec.APIServiceDefinitions.Required),
 		},
+		NativeAPIs:     csv.Spec.NativeAPIs,
+		MinKubeVersion: csv.Spec.MinKubeVersion,
+		RelatedImages:  GetImages(csvJSON),
 	}
 
 	icons := make([]Icon, len(csv.Spec.Icon))
@@ -69,3 +82,34 @@ func descriptionsForAPIServices(apis []operatorsv1alpha1.APIServiceDescription)
 	}
 	return descriptions
 }
+
+// GetImages returns a list of images listed in CSV (spec and deployments)
+func GetImages(csvJSON string) []string {
+	var images []string
+
+	csv := &registry.ClusterServiceVersion{}
+	err := json.Unmarshal([]byte(csvJSON), &csv)
+	if err != nil {
+		return images
+	}
+
+	imageSet, err := csv.GetOperatorImages()
+	if err != nil {
+		return images
+	}
+
+	relatedImgSet, err := csv.GetRelatedImages()
+	if err != nil {
+		return images
+	}
+
+	for k := range relatedImgSet {
+		imageSet[k] = struct{}{}
+	}
+
+	for k := range imageSet {
+		images = append(images, k)
+	}
+
+	return images
+}

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

@@ -107,6 +107,13 @@ type CSVDescription struct {
 
 	CustomResourceDefinitions operatorv1alpha1.CustomResourceDefinitions
 	APIServiceDefinitions     operatorv1alpha1.APIServiceDefinitions
+	NativeAPIs                []metav1.GroupVersionKind `json:"nativeApis,omitempty"`
+
+	// Minimum Kubernetes version for operator installation
+	MinKubeVersion string `json:"minKubeVersion,omitempty"`
+
+	// List of related images
+	RelatedImages []string `json:"relatedImages,omitempty"`
 }
 
 // AppLink defines a link to an application

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

@@ -1,9 +1,19 @@
 package v1
 
-import operatorsv1alpha1 "github.com/operator-framework/operator-lifecycle-manager/pkg/api/apis/operators/v1alpha1"
+import (
+	"encoding/json"
+
+	operatorsv1alpha1 "github.com/operator-framework/operator-lifecycle-manager/pkg/api/apis/operators/v1alpha1"
+	"github.com/operator-framework/operator-registry/pkg/registry"
+)
+
+const (
+	// The yaml attribute that specifies the related images of the ClusterServiceVersion
+	relatedImages = "relatedImages"
+)
 
 // CreateCSVDescription creates a CSVDescription from a given CSV
-func CreateCSVDescription(csv *operatorsv1alpha1.ClusterServiceVersion) CSVDescription {
+func CreateCSVDescription(csv *operatorsv1alpha1.ClusterServiceVersion, csvJSON string) CSVDescription {
 	desc := CSVDescription{
 		DisplayName: csv.Spec.DisplayName,
 		Version:     csv.Spec.Version,
@@ -16,6 +26,9 @@ func CreateCSVDescription(csv *operatorsv1alpha1.ClusterServiceVersion) CSVDescr
 		InstallModes:              csv.Spec.InstallModes,
 		CustomResourceDefinitions: csv.Spec.CustomResourceDefinitions,
 		APIServiceDefinitions:     csv.Spec.APIServiceDefinitions,
+		NativeAPIs:                csv.Spec.NativeAPIs,
+		MinKubeVersion:            csv.Spec.MinKubeVersion,
+		RelatedImages:             GetImages(csvJSON),
 	}
 
 	icons := make([]Icon, len(csv.Spec.Icon))
@@ -32,3 +45,34 @@ func CreateCSVDescription(csv *operatorsv1alpha1.ClusterServiceVersion) CSVDescr
 
 	return desc
 }
+
+// GetImages returns a list of images listed in CSV (spec and deployments)
+func GetImages(csvJSON string) []string {
+	var images []string
+
+	csv := &registry.ClusterServiceVersion{}
+	err := json.Unmarshal([]byte(csvJSON), &csv)
+	if err != nil {
+		return images
+	}
+
+	imageSet, err := csv.GetOperatorImages()
+	if err != nil {
+		return images
+	}
+
+	relatedImgSet, err := csv.GetRelatedImages()
+	if err != nil {
+		return images
+	}
+
+	for k := range relatedImgSet {
+		imageSet[k] = struct{}{}
+	}
+
+	for k := range imageSet {
+		images = append(images, k)
+	}
+
+	return images
+}

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

@@ -109,6 +109,13 @@ type CSVDescription struct {
 
 	CustomResourceDefinitions operatorv1alpha1.CustomResourceDefinitions `json:"customresourcedefinitions,omitempty"`
 	APIServiceDefinitions     operatorv1alpha1.APIServiceDefinitions     `json:"apiservicedefinitions,omitempty"`
+	NativeAPIs                []metav1.GroupVersionKind                  `json:"nativeApis,omitempty"`
+
+	// Minimum Kubernetes version for operator installation
+	MinKubeVersion string `json:"minKubeVersion,omitempty"`
+
+	// List of related images
+	RelatedImages []string `json:"relatedImages,omitempty"`
 }
 
 // AppLink defines a link to an application

pkg/package-server/apis/operators/v1/zz_generated.conversion.go

@@ -495,7 +495,7 @@ func newPackageManifest(ctx context.Context, logger *logrus.Entry, pkg *api.Pack
 		manifest.Status.Channels = append(manifest.Status.Channels, operators.PackageChannel{
 			Name:           pkgChannel.GetName(),
 			CurrentCSV:     csv.GetName(),
-			CurrentCSVDesc: operators.CreateCSVDescription(&csv),
+			CurrentCSVDesc: operators.CreateCSVDescription(&csv, bundle.GetCsvJson()),
 		})
 
 		if manifest.Status.DefaultChannel != "" && pkgChannel.GetName() == manifest.Status.DefaultChannel || !providerSet {