Merge pull request #238 from ksimon1/fix-missing-version

[backport] fix missing version in csv
kubevirt · Sep 14, 2020 · 6d44366 · 6d44366
2 parents f74b419 + f0b9b4b
commit 6d44366
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/build/update-csv.py b/build/update-csv.py
@@ -53,6 +53,7 @@
         'displayName': 'KubeVirt Template Validator admission webhook',
         'description': \
                 'Represents a deployment of admission control webhook to validate the KubeVirt templates',
+        'version': 'v1',
         'specDescriptors': [{
             'description': \
                 'The version of the KubeVirt Template Validator to deploy',
@@ -68,6 +69,7 @@
         'displayName': 'KubeVirt common templates',
         'description': \
                 'Represents a deployment of the predefined VM templates',
+        'version': 'v1',
         'specDescriptors': [{
             'description': \
                 'The version of the KubeVirt Templates to deploy',
@@ -81,6 +83,7 @@
     },
     'kubevirtnodelabellerbundles.ssp.kubevirt.io': {
         'displayName': 'KubeVirt Node labeller',
+        'version': 'v1',
         'description': \
                 'Represents a deployment of Node labeller component',
         'specDescriptors': [{
@@ -98,6 +101,7 @@
         'displayName': 'KubeVirt Metric Aggregation',
         'description': \
                 'Provide aggregation rules for core kubevirt metrics',
+        'version': 'v1',
         'specDescriptors': [{
             'description': \
                 'The version of the aggregation rules to deploy',

diff --git a/deploy/olm-catalog/kubevirt-ssp-operator.clusterserviceversion.yaml b/deploy/olm-catalog/kubevirt-ssp-operator.clusterserviceversion.yaml
@@ -2,7 +2,7 @@ apiVersion: operators.coreos.com/v1alpha1
 kind: ClusterServiceVersion
 metadata:
   annotations:
-    alm-examples: '[{"apiVersion":"ssp.kubevirt.io/v1","kind":"KubevirtMetricsAggregation","metadata":{"name":"kubevirt-metrics-aggregation","namespace":"kubevirt"}},{"apiVersion":"ssp.kubevirt.io/v1","kind":"KubevirtNodeLabellerBundle","metadata":{"name":"kubevirt-node-labeller-bundle","namespace":"kubevirt"}},{"apiVersion":"ssp.kubevirt.io/v1","kind":"KubevirtTemplateValidator","metadata":{"name":"kubevirt-template-validator","namespace":"kubevirt"},"spec":{"templateValidatorReplicas":2}},{"apiVersion":"ssp.kubevirt.io/v1","kind":"KubevirtCommonTemplatesBundle","metadata":{"name":"kubevirt-common-template-bundle","namespace":"kubevirt"}}]'
+    alm-examples: '[{"apiVersion":"ssp.kubevirt.io/v1","kind":"KubevirtCommonTemplatesBundle","metadata":{"name":"kubevirt-common-template-bundle","namespace":"kubevirt"}},{"apiVersion":"ssp.kubevirt.io/v1","kind":"KubevirtMetricsAggregation","metadata":{"name":"kubevirt-metrics-aggregation","namespace":"kubevirt"}},{"apiVersion":"ssp.kubevirt.io/v1","kind":"KubevirtNodeLabellerBundle","metadata":{"name":"kubevirt-node-labeller-bundle","namespace":"kubevirt"}},{"apiVersion":"ssp.kubevirt.io/v1","kind":"KubevirtTemplateValidator","metadata":{"name":"kubevirt-template-validator","namespace":"kubevirt"},"spec":{"templateValidatorReplicas":2}}]'
     capabilities: Basic Install
     categories: Openshift Optional
     containerImage: REPLACE_IMAGE
@@ -24,7 +24,7 @@ spec:
         version: v1
         x-descriptors:
         - urn:alm:descriptor:io.kubernetes.ssp:version
-      version: ''
+      version: v1
     - description: Provide aggregation rules for core kubevirt metrics
       displayName: KubeVirt Metric Aggregation
       kind: KubevirtMetricsAggregation
@@ -36,7 +36,7 @@ spec:
         version: v1
         x-descriptors:
         - urn:alm:descriptor:io.kubernetes.ssp:version
-      version: ''
+      version: v1
     - description: Represents a deployment of Node labeller component
       displayName: KubeVirt Node labeller
       kind: KubevirtNodeLabellerBundle
@@ -48,7 +48,7 @@ spec:
         version: v1
         x-descriptors:
         - urn:alm:descriptor:io.kubernetes.ssp:version
-      version: ''
+      version: v1
     - description: Represents a deployment of admission control webhook to validate
         the KubeVirt templates
       displayName: KubeVirt Template Validator admission webhook
@@ -61,7 +61,7 @@ spec:
         version: v1
         x-descriptors:
         - urn:alm:descriptor:io.kubernetes.ssp:version
-      version: ''
+      version: v1
   description: KubeVirt Schedule, Scale and Performance Operator
   displayName: Kubevirt Ssp Operator
   install: