Update label property extraction from CSV

The label properties are now specified in CSV annotations.

Signed-off-by: Vu Dinh <[email protected]>

Author: dinhxuanvu

manifests/etcd/0.9.2/etcdoperator.v0.9.2.clusterserviceversion.yaml

@@ -4,10 +4,8 @@ kind: ClusterServiceVersion
 metadata:
   name: etcdoperator.v0.9.2
   namespace: placeholder
-  labels:
-    olm.label: testlabel
-    olm.label.1: testlabel1
   annotations:
+    olm.properties: '[{"type":"olm.label","value":{"label":"testlabel"}},{"type":"olm.label","value":{"label":"testlabel1"}}]'
     tectonic-visibility: ocs
     olm.skipRange: "< 0.6.0"
     alm-examples: '[{"apiVersion":"etcd.database.coreos.com/v1beta2","kind":"EtcdCluster","metadata":{"name":"example","namespace":"default"},"spec":{"size":3,"version":"3.2.13"}},{"apiVersion":"etcd.database.coreos.com/v1beta2","kind":"EtcdRestore","metadata":{"name":"example-etcd-cluster"},"spec":{"etcdCluster":{"name":"example-etcd-cluster"},"backupStorageType":"S3","s3":{"path":"<full-s3-path>","awsSecret":"<aws-secret>"}}},{"apiVersion":"etcd.database.coreos.com/v1beta2","kind":"EtcdBackup","metadata":{"name":"example-etcd-cluster-backup"},"spec":{"etcdEndpoints":["<etcd-cluster-endpoints>"],"storageType":"S3","s3":{"path":"<full-s3-path>","awsSecret":"<aws-secret>"}}}]'

pkg/registry/types.go

@@ -44,6 +44,7 @@ const (
 	PackageType    = "olm.package"
 	DeprecatedType = "olm.deprecated"
 	LabelType      = "olm.label"
+	PropertyKey    = "olm.properties"
 )
 
 // APIKey stores GroupVersionKind for use as map keys
@@ -172,7 +173,7 @@ type Property struct {
 	Type string `json:"type" yaml:"type"`
 
 	// The serialized value of the propertuy
-	Value string `json:"value" yaml:"value"`
+	Value json.RawMessage `json:"value" yaml:"value"`
 }
 
 type GVKDependency struct {

pkg/server/server_test.go

@@ -777,7 +777,8 @@ func (s *sqlLoader) addBundleProperties(tx *sql.Tx, bundle *registry.Bundle) err
 	}
 
 	for _, prop := range bundle.Properties {
-		if err := s.addProperty(tx, prop.Type, prop.Value, bundle.Name, bundleVersion, bundle.BundleImage); err != nil {
+		value, _ := json.Marshal(prop.Value)
+		if err := s.addProperty(tx, prop.Type, string(value), bundle.Name, bundleVersion, bundle.BundleImage); err != nil {
 			return err
 		}
 	}
@@ -805,17 +806,27 @@ func (s *sqlLoader) addBundleProperties(tx *sql.Tx, bundle *registry.Bundle) err
 
 	// Add label properties
 	if csv, err := bundle.ClusterServiceVersion(); err == nil {
-		for k, v := range csv.GetLabels() {
-			if strings.HasPrefix(k, registry.LabelType) {
-				prop := registry.LabelProperty{
-					Label: v,
-				}
-				value, err := json.Marshal(prop)
-				if err != nil {
-					continue
-				}
-				if err := s.addProperty(tx, registry.LabelType, string(value), bundle.Name, bundleVersion, bundle.BundleImage); err != nil {
-					continue
+		annotations := csv.ObjectMeta.GetAnnotations()
+		if v, ok := annotations[registry.PropertyKey]; ok {
+			var props []registry.Property
+			if err := json.Unmarshal([]byte(v), &props); err == nil {
+				for _, prop := range props {
+					// Only add label type from the list
+					// TODO: Support more types such as GVK and package
+					if prop.Type == registry.LabelType {
+						var label registry.LabelProperty
+						err := json.Unmarshal(prop.Value, &label)
+						if err != nil {
+							continue
+						}
+						value, err := json.Marshal(label)
+						if err != nil {
+							continue
+						}
+						if err := s.addProperty(tx, registry.LabelType, string(value), bundle.Name, bundleVersion, bundle.BundleImage); err != nil {
+							continue
+						}
+					}
 				}
 			}
 		}