Bring back manual manifest specification for attaching storage (#427)

* return manual manifest specification for attaching storage

* fix I/O operation on empty file error

Author: gcie

README.md

@@ -467,6 +467,7 @@ Parameters:
 - `--readonly` - if set to true, workload can only read from storage.
 - `--size` - size of the storage in Gb.
 - `--bucket` - name of the storage bucket. If not set then the name of the storage is used as a bucket name.
+- `--manifest` - path to the manifest file containing PersistentVolume and PresistentVolumeClaim definitions. If set, then values from manifest override the following parameters: `--size` and `--bucket`.
 
 ### Filestore
 
@@ -502,6 +503,7 @@ Commands `xpk storage create` and `xpk storage attach` with `--type=gcpfilestore
 - `--access-mode` - access mode of the Filestore instance that will be created. Possible values are: `[ReadWriteOnce, ReadOnlyMany, ReadWriteMany]`
 - `--vol` - file share name of the Filestore instance that will be created.
 - `--instance` - the name of the Filestore instance. If not set then the name parameter is used as an instance name. Useful when connecting multiple volumes from the same Filestore instance.
+- `--manifest` - path to the manifest file containing PersistentVolume, PresistentVolumeClaim and StorageClass definitions. If set, then values from manifest override the following parameters: `--access-mode`, `--size` and `--volume`.
 
 ### List attached storages
 

src/xpk/commands/storage.py

@@ -16,6 +16,7 @@
 
 from argparse import Namespace
 
+import yaml
 from kubernetes import client as k8s_client
 from kubernetes.client import ApiClient
 from kubernetes.client.rest import ApiException
@@ -72,9 +73,13 @@ def storage_create(args: Namespace) -> None:
     filestore_client.create_instance(
         vol=args.vol, size=args.size, tier=args.tier, network=filestore_network
     )
-    manifest = filestore_client.manifest(
-        args.name, args.vol, args.access_mode, filestore_network
-    )
+    if args.manifest is not None:
+      with open(args.manifest, "r", encoding="utf-8") as f:
+        manifest = list(yaml.safe_load_all(f))
+    else:
+      manifest = filestore_client.manifest(
+          args.name, args.vol, args.access_mode, filestore_network
+      )
 
     k8s_api_client = setup_k8s_env(args)
     create_storage_crds(k8s_api_client, args, manifest)
@@ -137,22 +142,30 @@ def storage_attach(args: Namespace) -> None:
       xpk_print(f"Filestore instance {args.instance} does not exists.")
       xpk_exit(1)
 
-    filestore_network = get_cluster_network(args)
-    manifest = filestore_client.manifest(
-        args.name, args.vol, args.access_mode, filestore_network
-    )
+    if args.manifest is not None:
+      with open(args.manifest, "r", encoding="utf-8") as f:
+        manifest = list(yaml.safe_load_all(f))
+    else:
+      filestore_network = get_cluster_network(args)
+      manifest = filestore_client.manifest(
+          args.name, args.vol, args.access_mode, filestore_network
+      )
 
   else:  # args.type == GCS_FUSE_TYPE:
-    if args.size is None:
+    if args.manifest is None and args.size is None:
       xpk_print("--size is required when attaching gcsfuse storage.")
       xpk_exit(1)
 
     if args.bucket is None:
       args.bucket = args.name
 
-    manifest = gcsfuse.manifest(
-        name=args.name, bucket=args.bucket, size=args.size
-    )
+    if args.manifest is not None:
+      with open(args.manifest, "r", encoding="utf-8") as f:
+        manifest = list(yaml.safe_load_all(f))
+    else:
+      manifest = gcsfuse.manifest(
+          name=args.name, bucket=args.bucket, size=args.size
+      )
 
   k8s_api_client = setup_k8s_env(args)
   create_storage_crds(k8s_api_client, args, manifest)

src/xpk/parser/storage.py

@@ -148,6 +148,11 @@ def add_storage_attach_parser(
       'Optional Arguments',
       'Optional arguments for storage create.',
   )
+  opt_args.add_argument(
+      '--manifest',
+      type=str,
+      help='Path to manifest file containing volume definitions',
+  )
   add_kind_cluster_arguments(opt_args)
 
 
@@ -238,6 +243,11 @@ def add_storage_create_parser(
       help='Access mode of created filestore instance',
       default='ReadWriteMany',
   )
+  opt_args.add_argument(
+      '--manifest',
+      type=str,
+      help='Path to manifest file containing volume definitions',
+  )
 
   add_kind_cluster_arguments(opt_args)