Skip to content

Add annotation in CSV to make StorageCluster the initialization resource #907

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 4, 2020
Merged

Add annotation in CSV to make StorageCluster the initialization resource #907

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf2e517
Add annotation in CSV to make StorageCluster the initialization resou…
bipuladh Dec 4, 2020
3e8d371
Add annotation in CSV to make StorageCluster the initialization resou…
bipuladh Dec 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions deploy/olm-catalog/ocs-operator/manifests/ocs-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -975,6 +975,7 @@ metadata:
features.ocs.openshift.io/enabled: '["external", "minimal_deployment", "encryption"]'
olm.skipRange: '>=0.0.1 <4.7.0'
operatorframework.io/cluster-monitoring: "true"
operatorframework.io/initialization-resource: "\n {\n \"apiVersion\": \"ocs.openshift.io/v1\",\n \"kind\": \"StorageCluster\",\n \"metadata\": {\n \"name\": \"example-storagecluster\",\n \"namespace\": \"openshift-storage\"\n },\n \"spec\": {\n \"manageNodes\": false,\n \"monPVCTemplate\": {\n \"spec\": {\n \"accessModes\": [\n \"ReadWriteOnce\"\n ],\n \"resources\": {\n \"requests\": {\n \"storage\": \"10Gi\"\n }\n },\n \"storageClassName\": \"gp2\"\n }\n },\n \"storageDeviceSets\": [\n {\n \"count\": 3,\n \"dataPVCTemplate\": {\n \"spec\": {\n \"accessModes\": [\n \"ReadWriteOnce\"\n ],\n \"resources\": {\n \"requests\": {\n \"storage\": \"1Ti\"\n }\n },\n \"storageClassName\": \"gp2\",\n \"volumeMode\": \"Block\"\n }\n },\n \"name\": \"example-deviceset\",\n \"placement\": {},\n \"portable\": true,\n \"resources\": {}\n }\n ]\n }\n }\n\t"
operatorframework.io/suggested-namespace: openshift-storage
operators.operatorframework.io/internal-objects: '["ocsinitializations.ocs.openshift.io","cephblockpools.ceph.rook.io","cephclients.ceph.rook.io","cephclusters.ceph.rook.io","cephfilesystems.ceph.rook.io","cephnfses.ceph.rook.io","cephobjectrealms.ceph.rook.io","cephobjectstores.ceph.rook.io","cephobjectstoreusers.ceph.rook.io","cephobjectzonegroups.ceph.rook.io","cephobjectzones.ceph.rook.io","cephrbdmirrors.ceph.rook.io","cephclusters.ceph.rook.io","cephblockpools.ceph.rook.io","cephobjectstores.ceph.rook.io","cephobjectstoreusers.ceph.rook.io","cephnfses.ceph.rook.io","cephclients.ceph.rook.io","cephfilesystems.ceph.rook.io","cephrbdmirrors.ceph.rook.io","cephobjectrealms.ceph.rook.io","cephobjectzonegroups.ceph.rook.io","cephobjectzones.ceph.rook.io","noobaas.noobaa.io","objectbucketclaims.objectbucket.io","objectbuckets.objectbucket.io"]'
repository: https://github.com/openshift/ocs-operator
Expand Down
50 changes: 50 additions & 0 deletions tools/csv-merger/csv-merger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -678,6 +678,56 @@ The NooBaa operator deploys and manages the [NooBaa][2] Multi-Cloud Gateway on O
ocsCSV.Annotations["categories"] = "Storage"
ocsCSV.Annotations["operatorframework.io/suggested-namespace"] = "openshift-storage"
ocsCSV.Annotations["operatorframework.io/cluster-monitoring"] = "true"
// Make Storage cluster the initialization resource
ocsCSV.Annotations["operatorframework.io/initialization-resource"] = `
{
"apiVersion": "ocs.openshift.io/v1",
"kind": "StorageCluster",
"metadata": {
"name": "example-storagecluster",
"namespace": "openshift-storage"
},
"spec": {
"manageNodes": false,
"monPVCTemplate": {
"spec": {
"accessModes": [
"ReadWriteOnce"
],
"resources": {
"requests": {
"storage": "10Gi"
}
},
"storageClassName": "gp2"
}
},
"storageDeviceSets": [
{
"count": 3,
"dataPVCTemplate": {
"spec": {
"accessModes": [
"ReadWriteOnce"
],
"resources": {
"requests": {
"storage": "1Ti"
}
},
"storageClassName": "gp2",
"volumeMode": "Block"
}
},
"name": "example-deviceset",
"placement": {},
"portable": true,
"resources": {}
}
]
}
}
`
ocsCSV.Annotations["alm-examples"] = `
[
{
Expand Down