Skip to content

Commit

Permalink
Merge pull request red-hat-storage#355 from kshlm/update-csv-description
Browse files Browse the repository at this point in the history
Update CSV for 4.3.0
  • Loading branch information
openshift-merge-robot authored Dec 9, 2019
2 parents aa9754b + 72ce6fb commit 8b00f7c
Showing 25 changed files with 158 additions and 46 deletions.
Original file line number Diff line number Diff line change
@@ -52,27 +52,11 @@ 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
categories: Storage
name: ocs-operator.v0.0.2
name: ocs-operator.v4.3.0
namespace: placeholder
spec:
apiservicedefinitions: {}
@@ -238,7 +222,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 +284,81 @@ spec:
name: statefulsets.apps
version: v1
version: v1alpha1
description: |2-
description: |2
Red Hat OpenShift Container Storage (RHOCS) provides hyperconverged storage for applications within an OpenShift cluster.
## 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
Red Hat Openshift Container Storage (OCS) provides hyperconverged storage for applications within an Openshift cluster.
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.
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
[1]: https://rook.io
[2]: https://noobaa.io
displayName: OpenShift Container Storage
install:
spec:
clusterPermissions:
@@ -1422,4 +1475,4 @@ spec:
provider:
name: Red Hat
replaces: ocs-operator.v0.0.1
version: 0.0.2
version: 4.3.0
5 changes: 4 additions & 1 deletion deploy/olm-catalog/ocs-operator/ocs-operator.package.yaml
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion hack/generate-latest-csv.sh
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion hack/latest-csv-checksum.md5
Original file line number Diff line number Diff line change
@@ -1 +1 @@
b8b9747bc624034a9f72d933ace56aaa
1d7b853e444cb1dea8937520047221ee
96 changes: 76 additions & 20 deletions tools/csv-merger/csv-merger.go
Original file line number Diff line number Diff line change
@@ -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 != "" {
@@ -605,22 +677,6 @@ The OCS operator is the primary operator for Red Hat OpenShift Container Storage
}
]
}
},
{
"apiVersion": "ocs.openshift.io/v1",
"kind": "OCSInitialization",
"metadata": {
"name": "example-ocsinitialization"
},
"spec": {}
},
{
"apiVersion": "ocs.openshift.io/v1",
"kind": "StorageClusterInitialization",
"metadata": {
"name": "example-storageclusterinitialization"
},
"spec": {}
}
]`

0 comments on commit 8b00f7c

Please sign in to comment.