Merge pull request #158 from darkowlzz/olm-1.4-prep

OLM: update example with NFS, make CSI default
storageos · Sep 4, 2019 · 1e25295 · 1e25295
2 parents 43761b7 + 3f21707
commit 1e25295
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 6 deletions.
diff --git a/deploy/olm/csv-rhel/storageos.clusterserviceversion.yaml b/deploy/olm/csv-rhel/storageos.clusterserviceversion.yaml
@@ -508,7 +508,9 @@ spec:
       version: v1
       kind: NFSServer
       displayName: NFS Server
-      description: NFS Server creates a NFS Ganesha server.
+      description: StorageOS NFS Server provides support for shared volumes. The StorageOS
+        control plane will automatically create and manage NFS Server instances when
+        a PersistentVolumeClaim requests a volume with AccessMode=ReadWriteMany.
       specDescriptors:
       - description: The container image of the NFS server.
         displayName: Image

diff --git a/deploy/olm/storageos/storageos.clusterserviceversion.yaml b/deploy/olm/storageos/storageos.clusterserviceversion.yaml
@@ -24,7 +24,11 @@ metadata:
           "spec": {
             "namespace": "kube-system",
             "secretRefName": "storageos-api",
-            "secretRefNamespace": "default"
+            "secretRefNamespace": "default",
+            "csi": {
+              "enable": true,
+              "deploymentStrategy": "deployment"
+            }
           }
         },
         {
@@ -523,7 +527,9 @@ spec:
       version: v1
       kind: NFSServer
       displayName: NFS Server
-      description: NFS Server creates a NFS Ganesha server.
+      description: StorageOS NFS Server provides support for shared volumes. The StorageOS
+        control plane will automatically create and manage NFS Server instances when
+        a PersistentVolumeClaim requests a volume with AccessMode=ReadWriteMany.
       specDescriptors:
       - description: The container image of the NFS server.
         displayName: Image

diff --git a/deploy/storageos-operators.configmap.yaml b/deploy/storageos-operators.configmap.yaml
@@ -613,7 +613,11 @@ data:
                 "spec": {
                   "namespace": "kube-system",
                   "secretRefName": "storageos-api",
-                  "secretRefNamespace": "default"
+                  "secretRefNamespace": "default",
+                  "csi": {
+                    "enable": true,
+                    "deploymentStrategy": "deployment"
+                  }
                 }
               },
               {
@@ -1122,7 +1126,10 @@ data:
             version: v1
             kind: NFSServer
             displayName: NFS Server
-            description: NFS Server creates a NFS Ganesha server.
+            description: StorageOS NFS Server provides support for shared
+             volumes. The StorageOS control plane will automatically create and
+             manage NFS Server instances when a PersistentVolumeClaim requests a
+             volume with AccessMode=ReadWriteMany.
             specDescriptors:
             - description: The container image of the NFS server.
               displayName: Image

diff --git a/scripts/metadata-checker/update-metadata-files.sh b/scripts/metadata-checker/update-metadata-files.sh
@@ -1,6 +1,11 @@
 #!/bin/bash
 set -e
 
+# This script reads all the configurations from OLM configmap, combines with
+# *-changes.yaml file, if applicable, and updates the CSV, CRD and package
+# files. This script is used to sync the source configmap configurations with
+# the OLM manifest files.
+
 # Extract CSV from configmap, update with community operator changes and write
 # to the final CSV file.
 yq r deploy/storageos-operators.configmap.yaml \

diff --git a/scripts/release-helpers/release-gen.sh b/scripts/release-helpers/release-gen.sh
@@ -86,7 +86,11 @@ metadata.annotations.alm-examples: |-
       "spec": {
         "namespace": "kube-system",
         "secretRefName": "storageos-api",
-        "secretRefNamespace": "default"
+        "secretRefNamespace": "default",
+        "csi": {
+          "enable": true,
+          "deploymentStrategy": "deployment"
+        }
       }
     },
     {
@@ -114,6 +118,21 @@ metadata.annotations.alm-examples: |-
       "spec": {
         "newImage": "registry.connect.redhat.com/storageos/node:latest"
       }
+    },
+    {
+      "apiVersion": "storageos.com/v1",
+      "kind": "NFSServer",
+      "metadata": {
+        "name": "example-nfsserver",
+        "namespace": "default"
+      },
+      "spec": {
+        "resources": {
+          "requests": {
+            "storage": "1Gi"
+          }
+        }
+      }
     }
   ]