From 22ca8d3121c3345d3904d5384463b26c762bc7df Mon Sep 17 00:00:00 2001 From: Kaushal M Date: Wed, 4 Dec 2019 21:12:20 +0530 Subject: [PATCH 1/3] csv: Better description Improve the description in the CSV to have more details on the install requirements. Signed-off-by: Kaushal M --- ...operator.v0.0.2.clusterserviceversion.yaml | 79 ++++++++++++++++-- hack/latest-csv-checksum.md5 | 2 +- tools/csv-merger/csv-merger.go | 80 ++++++++++++++++++- 3 files changed, 151 insertions(+), 10 deletions(-) diff --git a/deploy/olm-catalog/ocs-operator/0.0.2/ocs-operator.v0.0.2.clusterserviceversion.yaml b/deploy/olm-catalog/ocs-operator/0.0.2/ocs-operator.v0.0.2.clusterserviceversion.yaml index 65e520fdfd..bdbbe88e97 100644 --- a/deploy/olm-catalog/ocs-operator/0.0.2/ocs-operator.v0.0.2.clusterserviceversion.yaml +++ b/deploy/olm-catalog/ocs-operator/0.0.2/ocs-operator.v0.0.2.clusterserviceversion.yaml @@ -238,7 +238,7 @@ spec: kind: OCSInitialization name: ocsinitializations.ocs.openshift.io version: v1 - - description: Storage Cluster represents a Openshift Container Storage Cluster + - description: Storage Cluster represents a OpenShift Container Storage Cluster including Ceph Cluster, NooBaa and all the storage and compute resources required. displayName: Storage Cluster kind: StorageCluster @@ -300,12 +300,81 @@ spec: name: statefulsets.apps version: v1 version: v1alpha1 - description: |2- + description: |2 - Red Hat Openshift Container Storage (OCS) provides hyperconverged storage for applications within an Openshift cluster. + Red Hat OpenShift Container Storage (RHOCS) provides hyperconverged storage for applications within an OpenShift cluster. - The OCS operator is the primary operator for Red Hat OpenShift Container Storage (OCS). It serves to facilitate the other operators in OCS by performing administrative tasks outside their scope as well as watching and configuring their CustomResources. - displayName: Openshift Container Storage Operator + ## Components + + RHOCS deploys three operators. + + ### OCS operator + + The OCS operator is the primary operator for RHOCS. It serves to facilitate the other operators in OCS by performing administrative tasks outside their scope as well as watching and configuring their CustomResources. + + ### Rook + + [Rook][1] deploys and manages Ceph on OpenShift, which provides block and file storage. + + ### NooBaa operator + + The NooBaa operator deploys and manages the [NooBaa][2] Multi-Cloud Gateway on OpenShift, which provides object storage. + + ## Before Subscription + + Before subcribing to RHOCS, there are two pre-requisites that need to be satisfied. + + ### Namespace + + RHOCS runs only in the openshift-storage Namespace, which needs to be created before subscription. The following manifest can be used to create the Namespace. + + ``` + apiVersion: v1 + kind: Namespace + metadata: + labels: + openshift.io/cluster-monitoring: "true" + name: openshift-storage + spec: {} + ``` + + Save the above as rhocs-namespace.yaml, and create the Namespace with, + + ``` + $ oc create -f rhocs-namespace.yaml + ``` + + + ### OperatorGroup + An OperatorGroup targetting the openshift-storage namespace also needs to be created. The following manifest can be used to create the OperatorGroup. + + ``` + apiVersion: operators.coreos.com/v1 + kind: OperatorGroup + metadata: + name: openshift-storage-operatorgroup + namespace: openshift-storage + spec: + serviceAccount: + metadata: + creationTimestamp: null + targetNamespaces: + - openshift-storage + ``` + + Save the above as rhocs-operatorgroup.yaml, and create the OperatorGroup with, + + ``` + $ oc create -f rhocs-operatorgroup.yaml + ``` + + ## After subscription + + After the three operators have been deployed into the openshift-storage namespace, a StorageCluster can be created. Note that the StorageCluster resource is the only resource that a user should be creating. RHOCS includes many other custom resources which are internal and not meant for direct usage by users. + + [1]: https://rook.io + [2]: https://noobaa.io + displayName: OpenShift Container Storage install: spec: clusterPermissions: diff --git a/hack/latest-csv-checksum.md5 b/hack/latest-csv-checksum.md5 index ec5b76188c..f2ad5f3a9c 100644 --- a/hack/latest-csv-checksum.md5 +++ b/hack/latest-csv-checksum.md5 @@ -1 +1 @@ -b8b9747bc624034a9f72d933ace56aaa \ No newline at end of file +17cef5a72375ea93e4b1daf439f7b7ff \ No newline at end of file diff --git a/tools/csv-merger/csv-merger.go b/tools/csv-merger/csv-merger.go index 9d95b9212e..829b9f5613 100644 --- a/tools/csv-merger/csv-merger.go +++ b/tools/csv-merger/csv-merger.go @@ -50,6 +50,8 @@ const ( ` + // Backticks cannot be escaped inside multi-line strings. So using this const and concating with multiline strings instead. + codeBlock = "```" ) var ( @@ -426,7 +428,7 @@ func generateUnifiedCSV() { switch definition.Name { case "storageclusters.ocs.openshift.io": ocsCSV.Spec.CustomResourceDefinitions.Owned[i].DisplayName = "Storage Cluster" - ocsCSV.Spec.CustomResourceDefinitions.Owned[i].Description = "Storage Cluster represents a Openshift Container Storage Cluster including Ceph Cluster, NooBaa and all the storage and compute resources required." + ocsCSV.Spec.CustomResourceDefinitions.Owned[i].Description = "Storage Cluster represents a OpenShift Container Storage Cluster including Ceph Cluster, NooBaa and all the storage and compute resources required." ocsCSV.Spec.CustomResourceDefinitions.Owned[i].Resources = []csvv1.APIResourceReference{ csvv1.APIResourceReference{ Name: "cephclusters.ceph.rook.io", @@ -545,11 +547,81 @@ func generateUnifiedCSV() { // Set Description ocsCSV.Spec.Description = ` -Red Hat Openshift Container Storage (OCS) provides hyperconverged storage for applications within an Openshift cluster. +Red Hat OpenShift Container Storage (RHOCS) provides hyperconverged storage for applications within an OpenShift cluster. -The OCS operator is the primary operator for Red Hat OpenShift Container Storage (OCS). It serves to facilitate the other operators in OCS by performing administrative tasks outside their scope as well as watching and configuring their CustomResources.` +## Components - ocsCSV.Spec.DisplayName = "Openshift Container Storage Operator" +RHOCS deploys three operators. + +### OCS operator + +The OCS operator is the primary operator for RHOCS. It serves to facilitate the other operators in OCS by performing administrative tasks outside their scope as well as watching and configuring their CustomResources. + +### Rook + +[Rook][1] deploys and manages Ceph on OpenShift, which provides block and file storage. + +### NooBaa operator + +The NooBaa operator deploys and manages the [NooBaa][2] Multi-Cloud Gateway on OpenShift, which provides object storage. + +## Before Subscription + +Before subcribing to RHOCS, there are two pre-requisites that need to be satisfied. + +### Namespace + +RHOCS runs only in the openshift-storage Namespace, which needs to be created before subscription. The following manifest can be used to create the Namespace. + +` + codeBlock + ` +apiVersion: v1 +kind: Namespace +metadata: + labels: + openshift.io/cluster-monitoring: "true" + name: openshift-storage +spec: {} +` + codeBlock + ` + +Save the above as rhocs-namespace.yaml, and create the Namespace with, + +` + codeBlock + ` +$ oc create -f rhocs-namespace.yaml +` + codeBlock + ` + + +### OperatorGroup +An OperatorGroup targetting the openshift-storage namespace also needs to be created. The following manifest can be used to create the OperatorGroup. + +` + codeBlock + ` +apiVersion: operators.coreos.com/v1 +kind: OperatorGroup +metadata: + name: openshift-storage-operatorgroup + namespace: openshift-storage +spec: + serviceAccount: + metadata: + creationTimestamp: null + targetNamespaces: + - openshift-storage +` + codeBlock + ` + +Save the above as rhocs-operatorgroup.yaml, and create the OperatorGroup with, + +` + codeBlock + ` +$ oc create -f rhocs-operatorgroup.yaml +` + codeBlock + ` + +## After subscription + +After the three operators have been deployed into the openshift-storage namespace, a StorageCluster can be created. Note that the StorageCluster resource is the only resource that a user should be creating. RHOCS includes many other custom resources which are internal and not meant for direct usage by users. + +[1]: https://rook.io +[2]: https://noobaa.io +` + + ocsCSV.Spec.DisplayName = "OpenShift Container Storage" // Set Annotations if *skipRange != "" { From 98c4cdefd3c810a1419ed4daa2b382a45393622e Mon Sep 17 00:00:00 2001 From: Kaushal M Date: Wed, 4 Dec 2019 21:19:05 +0530 Subject: [PATCH 2/3] csv: Cleanup alm-examples OCSInitialization is not supposed to be directly created by the user. StorageClusterInitialization does not exist anymore. Signed-off-by: Kaushal M --- ...cs-operator.v0.0.2.clusterserviceversion.yaml | 16 ---------------- hack/latest-csv-checksum.md5 | 2 +- tools/csv-merger/csv-merger.go | 16 ---------------- 3 files changed, 1 insertion(+), 33 deletions(-) diff --git a/deploy/olm-catalog/ocs-operator/0.0.2/ocs-operator.v0.0.2.clusterserviceversion.yaml b/deploy/olm-catalog/ocs-operator/0.0.2/ocs-operator.v0.0.2.clusterserviceversion.yaml index bdbbe88e97..c8026a5c6e 100644 --- a/deploy/olm-catalog/ocs-operator/0.0.2/ocs-operator.v0.0.2.clusterserviceversion.yaml +++ b/deploy/olm-catalog/ocs-operator/0.0.2/ocs-operator.v0.0.2.clusterserviceversion.yaml @@ -52,22 +52,6 @@ metadata: } ] } - }, - { - "apiVersion": "ocs.openshift.io/v1", - "kind": "OCSInitialization", - "metadata": { - "name": "example-ocsinitialization" - }, - "spec": {} - }, - { - "apiVersion": "ocs.openshift.io/v1", - "kind": "StorageClusterInitialization", - "metadata": { - "name": "example-storageclusterinitialization" - }, - "spec": {} } ] capabilities: Full Lifecycle diff --git a/hack/latest-csv-checksum.md5 b/hack/latest-csv-checksum.md5 index f2ad5f3a9c..9110cc6001 100644 --- a/hack/latest-csv-checksum.md5 +++ b/hack/latest-csv-checksum.md5 @@ -1 +1 @@ -17cef5a72375ea93e4b1daf439f7b7ff \ No newline at end of file +fd7bdea055abd7c8dcd49a4aabe34f30 \ No newline at end of file diff --git a/tools/csv-merger/csv-merger.go b/tools/csv-merger/csv-merger.go index 829b9f5613..4f48719674 100644 --- a/tools/csv-merger/csv-merger.go +++ b/tools/csv-merger/csv-merger.go @@ -677,22 +677,6 @@ After the three operators have been deployed into the openshift-storage namespac } ] } - }, - { - "apiVersion": "ocs.openshift.io/v1", - "kind": "OCSInitialization", - "metadata": { - "name": "example-ocsinitialization" - }, - "spec": {} - }, - { - "apiVersion": "ocs.openshift.io/v1", - "kind": "StorageClusterInitialization", - "metadata": { - "name": "example-storageclusterinitialization" - }, - "spec": {} } ]` From 72ce6fba86f9951546362ace34823bf8b04c56df Mon Sep 17 00:00:00 2001 From: Kaushal M Date: Wed, 4 Dec 2019 21:27:05 +0530 Subject: [PATCH 3/3] csv: 0.0.2 -> 4.3.0 Change the CSV version to follow the release. Signed-off-by: Kaushal M --- .../ocs-operator/{0.0.2 => 4.3.0}/backingstore.crd.yaml | 0 .../ocs-operator/{0.0.2 => 4.3.0}/bucketclass.crd.yaml | 0 .../ocs-operator/{0.0.2 => 4.3.0}/cephblockpool.crd.yaml | 0 .../ocs-operator/{0.0.2 => 4.3.0}/cephcluster.crd.yaml | 0 .../ocs-operator/{0.0.2 => 4.3.0}/cephfilesystem.crd.yaml | 0 .../ocs-operator/{0.0.2 => 4.3.0}/cephnfs.crd.yaml | 0 .../ocs-operator/{0.0.2 => 4.3.0}/cephobjectstore.crd.yaml | 0 .../{0.0.2 => 4.3.0}/cephobjectstoreuser.crd.yaml | 0 .../ocs-operator/{0.0.2 => 4.3.0}/noobaa-metrics-role.yaml | 0 .../{0.0.2 => 4.3.0}/noobaa-metrics-role_binding.yaml | 0 .../ocs-operator/{0.0.2 => 4.3.0}/noobaa.crd.yaml | 0 .../ocs-operator/{0.0.2 => 4.3.0}/objectbucket.crd.yaml | 0 .../ocs-operator/{0.0.2 => 4.3.0}/objectbucketclaim.crd.yaml | 0 .../ocs-operator.v4.3.0.clusterserviceversion.yaml} | 4 ++-- .../ocs-operator/{0.0.2 => 4.3.0}/ocsinitialization.crd.yaml | 0 .../ocs-operator/{0.0.2 => 4.3.0}/rook-metrics-role.yaml | 0 .../{0.0.2 => 4.3.0}/rook-metrics-role_binding.yaml | 0 .../ocs-operator/{0.0.2 => 4.3.0}/rook-monitor-role.yaml | 0 .../{0.0.2 => 4.3.0}/rook-monitor-role_binding.yaml | 0 .../ocs-operator/{0.0.2 => 4.3.0}/storagecluster.crd.yaml | 0 .../{0.0.2 => 4.3.0}/storageclusterinitialization.crd.yaml | 0 deploy/olm-catalog/ocs-operator/ocs-operator.package.yaml | 5 ++++- hack/generate-latest-csv.sh | 2 +- hack/latest-csv-checksum.md5 | 2 +- 24 files changed, 8 insertions(+), 5 deletions(-) rename deploy/olm-catalog/ocs-operator/{0.0.2 => 4.3.0}/backingstore.crd.yaml (100%) rename deploy/olm-catalog/ocs-operator/{0.0.2 => 4.3.0}/bucketclass.crd.yaml (100%) rename deploy/olm-catalog/ocs-operator/{0.0.2 => 4.3.0}/cephblockpool.crd.yaml (100%) rename deploy/olm-catalog/ocs-operator/{0.0.2 => 4.3.0}/cephcluster.crd.yaml (100%) rename deploy/olm-catalog/ocs-operator/{0.0.2 => 4.3.0}/cephfilesystem.crd.yaml (100%) rename deploy/olm-catalog/ocs-operator/{0.0.2 => 4.3.0}/cephnfs.crd.yaml (100%) rename deploy/olm-catalog/ocs-operator/{0.0.2 => 4.3.0}/cephobjectstore.crd.yaml (100%) rename deploy/olm-catalog/ocs-operator/{0.0.2 => 4.3.0}/cephobjectstoreuser.crd.yaml (100%) rename deploy/olm-catalog/ocs-operator/{0.0.2 => 4.3.0}/noobaa-metrics-role.yaml (100%) rename deploy/olm-catalog/ocs-operator/{0.0.2 => 4.3.0}/noobaa-metrics-role_binding.yaml (100%) rename deploy/olm-catalog/ocs-operator/{0.0.2 => 4.3.0}/noobaa.crd.yaml (100%) rename deploy/olm-catalog/ocs-operator/{0.0.2 => 4.3.0}/objectbucket.crd.yaml (100%) rename deploy/olm-catalog/ocs-operator/{0.0.2 => 4.3.0}/objectbucketclaim.crd.yaml (100%) rename deploy/olm-catalog/ocs-operator/{0.0.2/ocs-operator.v0.0.2.clusterserviceversion.yaml => 4.3.0/ocs-operator.v4.3.0.clusterserviceversion.yaml} (99%) rename deploy/olm-catalog/ocs-operator/{0.0.2 => 4.3.0}/ocsinitialization.crd.yaml (100%) rename deploy/olm-catalog/ocs-operator/{0.0.2 => 4.3.0}/rook-metrics-role.yaml (100%) rename deploy/olm-catalog/ocs-operator/{0.0.2 => 4.3.0}/rook-metrics-role_binding.yaml (100%) rename deploy/olm-catalog/ocs-operator/{0.0.2 => 4.3.0}/rook-monitor-role.yaml (100%) rename deploy/olm-catalog/ocs-operator/{0.0.2 => 4.3.0}/rook-monitor-role_binding.yaml (100%) rename deploy/olm-catalog/ocs-operator/{0.0.2 => 4.3.0}/storagecluster.crd.yaml (100%) rename deploy/olm-catalog/ocs-operator/{0.0.2 => 4.3.0}/storageclusterinitialization.crd.yaml (100%) diff --git a/deploy/olm-catalog/ocs-operator/0.0.2/backingstore.crd.yaml b/deploy/olm-catalog/ocs-operator/4.3.0/backingstore.crd.yaml similarity index 100% rename from deploy/olm-catalog/ocs-operator/0.0.2/backingstore.crd.yaml rename to deploy/olm-catalog/ocs-operator/4.3.0/backingstore.crd.yaml diff --git a/deploy/olm-catalog/ocs-operator/0.0.2/bucketclass.crd.yaml b/deploy/olm-catalog/ocs-operator/4.3.0/bucketclass.crd.yaml similarity index 100% rename from deploy/olm-catalog/ocs-operator/0.0.2/bucketclass.crd.yaml rename to deploy/olm-catalog/ocs-operator/4.3.0/bucketclass.crd.yaml diff --git a/deploy/olm-catalog/ocs-operator/0.0.2/cephblockpool.crd.yaml b/deploy/olm-catalog/ocs-operator/4.3.0/cephblockpool.crd.yaml similarity index 100% rename from deploy/olm-catalog/ocs-operator/0.0.2/cephblockpool.crd.yaml rename to deploy/olm-catalog/ocs-operator/4.3.0/cephblockpool.crd.yaml diff --git a/deploy/olm-catalog/ocs-operator/0.0.2/cephcluster.crd.yaml b/deploy/olm-catalog/ocs-operator/4.3.0/cephcluster.crd.yaml similarity index 100% rename from deploy/olm-catalog/ocs-operator/0.0.2/cephcluster.crd.yaml rename to deploy/olm-catalog/ocs-operator/4.3.0/cephcluster.crd.yaml diff --git a/deploy/olm-catalog/ocs-operator/0.0.2/cephfilesystem.crd.yaml b/deploy/olm-catalog/ocs-operator/4.3.0/cephfilesystem.crd.yaml similarity index 100% rename from deploy/olm-catalog/ocs-operator/0.0.2/cephfilesystem.crd.yaml rename to deploy/olm-catalog/ocs-operator/4.3.0/cephfilesystem.crd.yaml diff --git a/deploy/olm-catalog/ocs-operator/0.0.2/cephnfs.crd.yaml b/deploy/olm-catalog/ocs-operator/4.3.0/cephnfs.crd.yaml similarity index 100% rename from deploy/olm-catalog/ocs-operator/0.0.2/cephnfs.crd.yaml rename to deploy/olm-catalog/ocs-operator/4.3.0/cephnfs.crd.yaml diff --git a/deploy/olm-catalog/ocs-operator/0.0.2/cephobjectstore.crd.yaml b/deploy/olm-catalog/ocs-operator/4.3.0/cephobjectstore.crd.yaml similarity index 100% rename from deploy/olm-catalog/ocs-operator/0.0.2/cephobjectstore.crd.yaml rename to deploy/olm-catalog/ocs-operator/4.3.0/cephobjectstore.crd.yaml diff --git a/deploy/olm-catalog/ocs-operator/0.0.2/cephobjectstoreuser.crd.yaml b/deploy/olm-catalog/ocs-operator/4.3.0/cephobjectstoreuser.crd.yaml similarity index 100% rename from deploy/olm-catalog/ocs-operator/0.0.2/cephobjectstoreuser.crd.yaml rename to deploy/olm-catalog/ocs-operator/4.3.0/cephobjectstoreuser.crd.yaml diff --git a/deploy/olm-catalog/ocs-operator/0.0.2/noobaa-metrics-role.yaml b/deploy/olm-catalog/ocs-operator/4.3.0/noobaa-metrics-role.yaml similarity index 100% rename from deploy/olm-catalog/ocs-operator/0.0.2/noobaa-metrics-role.yaml rename to deploy/olm-catalog/ocs-operator/4.3.0/noobaa-metrics-role.yaml diff --git a/deploy/olm-catalog/ocs-operator/0.0.2/noobaa-metrics-role_binding.yaml b/deploy/olm-catalog/ocs-operator/4.3.0/noobaa-metrics-role_binding.yaml similarity index 100% rename from deploy/olm-catalog/ocs-operator/0.0.2/noobaa-metrics-role_binding.yaml rename to deploy/olm-catalog/ocs-operator/4.3.0/noobaa-metrics-role_binding.yaml diff --git a/deploy/olm-catalog/ocs-operator/0.0.2/noobaa.crd.yaml b/deploy/olm-catalog/ocs-operator/4.3.0/noobaa.crd.yaml similarity index 100% rename from deploy/olm-catalog/ocs-operator/0.0.2/noobaa.crd.yaml rename to deploy/olm-catalog/ocs-operator/4.3.0/noobaa.crd.yaml diff --git a/deploy/olm-catalog/ocs-operator/0.0.2/objectbucket.crd.yaml b/deploy/olm-catalog/ocs-operator/4.3.0/objectbucket.crd.yaml similarity index 100% rename from deploy/olm-catalog/ocs-operator/0.0.2/objectbucket.crd.yaml rename to deploy/olm-catalog/ocs-operator/4.3.0/objectbucket.crd.yaml diff --git a/deploy/olm-catalog/ocs-operator/0.0.2/objectbucketclaim.crd.yaml b/deploy/olm-catalog/ocs-operator/4.3.0/objectbucketclaim.crd.yaml similarity index 100% rename from deploy/olm-catalog/ocs-operator/0.0.2/objectbucketclaim.crd.yaml rename to deploy/olm-catalog/ocs-operator/4.3.0/objectbucketclaim.crd.yaml diff --git a/deploy/olm-catalog/ocs-operator/0.0.2/ocs-operator.v0.0.2.clusterserviceversion.yaml b/deploy/olm-catalog/ocs-operator/4.3.0/ocs-operator.v4.3.0.clusterserviceversion.yaml similarity index 99% rename from deploy/olm-catalog/ocs-operator/0.0.2/ocs-operator.v0.0.2.clusterserviceversion.yaml rename to deploy/olm-catalog/ocs-operator/4.3.0/ocs-operator.v4.3.0.clusterserviceversion.yaml index c8026a5c6e..24100a7a12 100644 --- a/deploy/olm-catalog/ocs-operator/0.0.2/ocs-operator.v0.0.2.clusterserviceversion.yaml +++ b/deploy/olm-catalog/ocs-operator/4.3.0/ocs-operator.v4.3.0.clusterserviceversion.yaml @@ -56,7 +56,7 @@ metadata: ] capabilities: Full Lifecycle categories: Storage - name: ocs-operator.v0.0.2 + name: ocs-operator.v4.3.0 namespace: placeholder spec: apiservicedefinitions: {} @@ -1475,4 +1475,4 @@ spec: provider: name: Red Hat replaces: ocs-operator.v0.0.1 - version: 0.0.2 + version: 4.3.0 diff --git a/deploy/olm-catalog/ocs-operator/0.0.2/ocsinitialization.crd.yaml b/deploy/olm-catalog/ocs-operator/4.3.0/ocsinitialization.crd.yaml similarity index 100% rename from deploy/olm-catalog/ocs-operator/0.0.2/ocsinitialization.crd.yaml rename to deploy/olm-catalog/ocs-operator/4.3.0/ocsinitialization.crd.yaml diff --git a/deploy/olm-catalog/ocs-operator/0.0.2/rook-metrics-role.yaml b/deploy/olm-catalog/ocs-operator/4.3.0/rook-metrics-role.yaml similarity index 100% rename from deploy/olm-catalog/ocs-operator/0.0.2/rook-metrics-role.yaml rename to deploy/olm-catalog/ocs-operator/4.3.0/rook-metrics-role.yaml diff --git a/deploy/olm-catalog/ocs-operator/0.0.2/rook-metrics-role_binding.yaml b/deploy/olm-catalog/ocs-operator/4.3.0/rook-metrics-role_binding.yaml similarity index 100% rename from deploy/olm-catalog/ocs-operator/0.0.2/rook-metrics-role_binding.yaml rename to deploy/olm-catalog/ocs-operator/4.3.0/rook-metrics-role_binding.yaml diff --git a/deploy/olm-catalog/ocs-operator/0.0.2/rook-monitor-role.yaml b/deploy/olm-catalog/ocs-operator/4.3.0/rook-monitor-role.yaml similarity index 100% rename from deploy/olm-catalog/ocs-operator/0.0.2/rook-monitor-role.yaml rename to deploy/olm-catalog/ocs-operator/4.3.0/rook-monitor-role.yaml diff --git a/deploy/olm-catalog/ocs-operator/0.0.2/rook-monitor-role_binding.yaml b/deploy/olm-catalog/ocs-operator/4.3.0/rook-monitor-role_binding.yaml similarity index 100% rename from deploy/olm-catalog/ocs-operator/0.0.2/rook-monitor-role_binding.yaml rename to deploy/olm-catalog/ocs-operator/4.3.0/rook-monitor-role_binding.yaml diff --git a/deploy/olm-catalog/ocs-operator/0.0.2/storagecluster.crd.yaml b/deploy/olm-catalog/ocs-operator/4.3.0/storagecluster.crd.yaml similarity index 100% rename from deploy/olm-catalog/ocs-operator/0.0.2/storagecluster.crd.yaml rename to deploy/olm-catalog/ocs-operator/4.3.0/storagecluster.crd.yaml diff --git a/deploy/olm-catalog/ocs-operator/0.0.2/storageclusterinitialization.crd.yaml b/deploy/olm-catalog/ocs-operator/4.3.0/storageclusterinitialization.crd.yaml similarity index 100% rename from deploy/olm-catalog/ocs-operator/0.0.2/storageclusterinitialization.crd.yaml rename to deploy/olm-catalog/ocs-operator/4.3.0/storageclusterinitialization.crd.yaml diff --git a/deploy/olm-catalog/ocs-operator/ocs-operator.package.yaml b/deploy/olm-catalog/ocs-operator/ocs-operator.package.yaml index d2b38fffd8..a705e859c0 100644 --- a/deploy/olm-catalog/ocs-operator/ocs-operator.package.yaml +++ b/deploy/olm-catalog/ocs-operator/ocs-operator.package.yaml @@ -1,4 +1,7 @@ packageName: ocs-operator channels: +- name: 4.2.0 + currentCSV: ocs-operator.v0.0.1 - name: alpha - currentCSV: ocs-operator.v0.0.2 + currentCSV: ocs-operator.v4.3.0 +defaultChannel: alpha diff --git a/hack/generate-latest-csv.sh b/hack/generate-latest-csv.sh index 187febb3a2..f07a1b0c24 100755 --- a/hack/generate-latest-csv.sh +++ b/hack/generate-latest-csv.sh @@ -10,7 +10,7 @@ CSV_CHECKSUM="tools/csv-checksum/csv-checksum" export CSV_CHECKSUM_OUTFILE="hack/latest-csv-checksum.md5" # Current DEV version of the CSV -export CSV_VERSION=0.0.2 +export CSV_VERSION=4.3.0 export REPLACES_CSV_VERSION=${REPLACES_CSV_VERSION:-"0.0.1"} # Current dependency images our DEV CSV are pinned to diff --git a/hack/latest-csv-checksum.md5 b/hack/latest-csv-checksum.md5 index 9110cc6001..e789eaba38 100644 --- a/hack/latest-csv-checksum.md5 +++ b/hack/latest-csv-checksum.md5 @@ -1 +1 @@ -fd7bdea055abd7c8dcd49a4aabe34f30 \ No newline at end of file +1d7b853e444cb1dea8937520047221ee \ No newline at end of file