Merge pull request #122 from gallettilance/bundle-table-insert

Bug 1771522: add version and skiprange to operatorbundle table

Author: openshift-merge-robot

configmap.example.yaml

@@ -6184,6 +6184,7 @@ data:
         namespace: placeholder
         annotations:
           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>"}}}]'
       spec:
         displayName: etcd

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

@@ -6,6 +6,7 @@ metadata:
   namespace: placeholder
   annotations:
     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>"}}}]'
 spec:
   relatedImages:

pkg/registry/bundle.go

@@ -75,6 +75,20 @@ func (b *Bundle) ClusterServiceVersion() (*ClusterServiceVersion, error) {
 	return b.csv, nil
 }
 
+func (b *Bundle) Version() (string, error) {
+	if err := b.cache(); err != nil {
+		return "", err
+	}
+	return b.csv.GetVersion()
+}
+
+func (b *Bundle) SkipRange() (string, error) {
+	if err := b.cache(); err != nil {
+		return "", err
+	}
+	return b.csv.GetSkipRange(), nil
+}
+
 func (b *Bundle) CustomResourceDefinitions() ([]*v1beta1.CustomResourceDefinition, error) {
 	if err := b.cache(); err != nil {
 		return nil, err

pkg/registry/csv.go

@@ -32,6 +32,9 @@ const (
 
 	// The yaml attribute that specifies the related images of the ClusterServiceVersion
 	relatedImages = "relatedImages"
+
+	// The yaml attribute that specifies the skipRange of the ClusterServiceVersion
+	skipRangeAnnotationKey = "olm.skipRange"
 )
 
 // ClusterServiceVersion is a structured representation of cluster service
@@ -95,6 +98,17 @@ func (csv *ClusterServiceVersion) GetVersion() (string, error) {
 	return v, nil
 }
 
+// GetSkipRange returns the skiprange of the CSV
+//
+// If not defined, the function returns an empty string.
+func (csv *ClusterServiceVersion) GetSkipRange() string {
+	skipRange, ok := csv.Annotations[skipRangeAnnotationKey]
+	if !ok {
+		return ""
+	}
+	return skipRange
+}
+
 // GetSkips returns the name of the older ClusterServiceVersion objects that
 // are skipped by this ClusterServiceVersion object.
 //

pkg/server/server_test.go

@@ -56,7 +56,7 @@ func (s *SQLLoader) AddOperatorBundle(bundle *registry.Bundle) error {
 		tx.Rollback()
 	}()
 
-	stmt, err := tx.Prepare("insert into operatorbundle(name, csv, bundle, bundlepath) values(?, ?, ?, ?)")
+	stmt, err := tx.Prepare("insert into operatorbundle(name, csv, bundle, bundlepath, version, skiprange) values(?, ?, ?, ?, ?, ?)")
 	if err != nil {
 		return err
 	}
@@ -77,7 +77,16 @@ func (s *SQLLoader) AddOperatorBundle(bundle *registry.Bundle) error {
 		return fmt.Errorf("csv name not found")
 	}
 
-	if _, err := stmt.Exec(csvName, csvBytes, bundleBytes, bundleImage); err != nil {
+	version, err := bundle.Version()
+	if err != nil {
+		return err
+	}
+	skiprange, err := bundle.SkipRange()
+	if err != nil {
+		return err
+	}
+
+	if _, err := stmt.Exec(csvName, csvBytes, bundleBytes, bundleImage, version, skiprange); err != nil {
 		return err
 	}
 
@@ -618,7 +627,7 @@ func (s *SQLLoader) AddBundlePackageChannels(manifest registry.PackageManifest,
 		tx.Rollback()
 	}()
 
-	stmt, err := tx.Prepare("insert into operatorbundle(name, csv, bundle, bundlepath) values(?, ?, ?, ?)")
+	stmt, err := tx.Prepare("insert into operatorbundle(name, csv, bundle, bundlepath, version, skiprange) values(?, ?, ?, ?, ?, ?)")
 	if err != nil {
 		return err
 	}
@@ -639,7 +648,16 @@ func (s *SQLLoader) AddBundlePackageChannels(manifest registry.PackageManifest,
 		return fmt.Errorf("csv name not found")
 	}
 
-	if _, err := stmt.Exec(csvName, csvBytes, bundleBytes, bundleImage); err != nil {
+	version, err := bundle.Version()
+	if err != nil {
+		return err
+	}
+	skiprange, err := bundle.SkipRange()
+	if err != nil {
+		return err
+	}
+
+	if _, err := stmt.Exec(csvName, csvBytes, bundleBytes, bundleImage, version, skiprange); err != nil {
 		return err
 	}