xpk 0.7.0__py3-none-any.whl → 0.7.2__py3-none-any.whl

xpk/commands/storage.py

@@ -16,6 +16,7 @@ limitations under the License.
 
 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)

xpk/core/config.py

@@ -24,7 +24,7 @@ from ..utils.console import xpk_print
 from .system_characteristics import AcceleratorType, SystemCharacteristics
 
 # This is the version for XPK PyPI package
-__version__ = 'v0.7.0'
+__version__ = 'v0.7.2'
 XPK_CURRENT_VERSION = __version__
 XPK_CONFIG_FILE = os.path.expanduser('~/.config/xpk/config.yaml')
 

xpk/core/pathways.py

@@ -87,20 +87,20 @@ def get_pathways_sidecar_container(args) -> str:
     str: yaml containing arguments for the Pathways sidecar container.
   """
   yaml = """initContainers:
-            - name: remote-python-sidecar
-              image: {args.remote_python_sidecar_image}
-              imagePullPolicy: Always
-              securityContext:
-                privileged: true
-              volumeMounts:
-              - mountPath: /tmp  # Shared volume mount with the main container.
-                name: shared-tmp
-              restartPolicy: Always
-              ports:
-              - containerPort: 50051
-              env:
-              - name: GRPC_SERVER_ADDRESS
-                value: '0.0.0.0:50051'"""
+              - name: remote-python-sidecar
+                image: {args.remote_python_sidecar_image}
+                imagePullPolicy: Always
+                securityContext:
+                  privileged: true
+                volumeMounts:
+                - mountPath: /tmp  # Shared volume mount with the main container.
+                  name: shared-tmp
+                restartPolicy: Always
+                ports:
+                - containerPort: 50051
+                env:
+                - name: GRPC_SERVER_ADDRESS
+                  value: '0.0.0.0:50051'"""
   if args.use_pathways and args.remote_python_sidecar_image is not None:
     return yaml.format(args=args)
   else:

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)
 

{xpk-0.7.0.dist-info → xpk-0.7.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: xpk
-Version: 0.7.0
+Version: 0.7.2
 Summary: xpk helps Cloud developers to orchestrate training jobs on accelerators on GKE.
 Author-email: XPK team <xpk-code-reviewers@google.com>
 License: Apache-2.0
@@ -28,6 +28,7 @@ Requires-Dist: pylint>=2.6.0; extra == "dev"
 Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: docker==7.1.0; extra == "dev"
+Dynamic: license-file
 
 <!--
  Copyright 2023 Google LLC
@@ -498,6 +499,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
 
@@ -533,6 +535,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
 

{xpk-0.7.0.dist-info → xpk-0.7.2.dist-info}/RECORD

@@ -15,7 +15,7 @@ xpk/commands/kind.py,sha256=Vl3RT47kHCR0ORX9dK37HCiYtbmXJUCIAaq-QEbIclU,7578
 xpk/commands/kjob_common.py,sha256=aR6k_6yacr76QZDQmdoPO0M4Tg6H7ZPooKUTnOVZwXY,1596
 xpk/commands/run.py,sha256=-W32sfobmwxLNEQzBKFWgPs_UOWljRKjFyH-Unm9zsA,3853
 xpk/commands/shell.py,sha256=ZODaPNSmWHOpW48eHEt35IoM4x-0GQUGaLjOxQ63QSY,4235
-xpk/commands/storage.py,sha256=C1UOn1EBb-2ZvvqdL2I3qAVmoghVzaAWXrPPLG7R7dQ,8307
+xpk/commands/storage.py,sha256=oCo6iPHR9IL5IO7PjQrbB9_NDCjcCO3HYxMRuNpNqUU,8818
 xpk/commands/version.py,sha256=CU4mb71r66U28krnPAopC6vBpdK-IGclsy5uNaQcgRY,824
 xpk/commands/workload.py,sha256=N3hqe3tWuQMjGuk4DaiDoehgejYGYKwWXRygzJ58h-c,31710
 xpk/core/__init__.py,sha256=YPwWBbgLAu7L-YlTVGB2r8ZV4TzypURMRBcehSHHlLY,561
@@ -23,7 +23,7 @@ xpk/core/capacity.py,sha256=pli6McSdPgGJxsBfJNVk5lCjehp1s1WI82ETAvJT1_I,5365
 xpk/core/cluster.py,sha256=GPuasSTadvgmIb9Iw7giqw7FJDg0jEzIwbQLEkzjuvE,18352
 xpk/core/cluster_private.py,sha256=J2-UZ6t5f-UNdcSkuUr2_f4xk6xyrMH9Muk56trBh4M,6657
 xpk/core/commands.py,sha256=JiS4vJqWSLu8MKFBIKPBea9MKD2ZdpaQrziVQBqiDr4,10719
-xpk/core/config.py,sha256=KqNSVWzXb5pUXId1TeG2mydpnBzF7ryzduW1h586fAU,5659
+xpk/core/config.py,sha256=qFYohiDizy4NRgsY8V-OraKVOCqzaObtiLizGaHRFfA,5659
 xpk/core/docker_container.py,sha256=GvkCJ2S5UKn8uh3pZhRd3X7iS0-PsQpRO8l7QhywVGc,7604
 xpk/core/docker_image.py,sha256=fEdpLQg1C205mMbLREy48WnhvNv2Nm4KQFX87B2CuiA,6624
 xpk/core/docker_manager.py,sha256=_fE27tDCJPd9dUfswYoQMzZRMAMfxq6SxdFdOT-gzIQ,10566
@@ -38,7 +38,7 @@ xpk/core/monitoring.py,sha256=v9MvLzNfvJAVby_ehSlPe6PaO0_pf3shkXg5gd-UWm8,4338
 xpk/core/nap.py,sha256=BNO0fnTpza310cAVwITYktj1SN9tXVT_kCnsufKzYOE,12136
 xpk/core/network.py,sha256=kfvOJREHAm9JtGYdi6csnJeZNg81cjf5-5ECweZ6sWw,10478
 xpk/core/nodepool.py,sha256=1aBZXvaXWEXf2YJXj7w3NDQiPTLJ8b6cmizVPzeoVSY,22002
-xpk/core/pathways.py,sha256=KgpptvcYb21cwYWGuwW3HXd8teYUAK3EhZIuYulVdqs,11587
+xpk/core/pathways.py,sha256=OHJOpf0qbKGECjYD31TUJ4rT5SDgs9-AOtLWMGjBqxQ,11615
 xpk/core/ray.py,sha256=UxOpIc2enHi1fQ4h3KO8FH8bIyEMtYzGtPoeqJKGG4o,6337
 xpk/core/resources.py,sha256=IXzvuA8saK6Xvv4MHTWYVeWJDR3MbH_RScd-Dp_qxlM,7669
 xpk/core/scheduling.py,sha256=8BAg8YyftJULHeq-A5nmgpPYVjyEjbVjSG6cWYCAcX0,8348
@@ -68,7 +68,7 @@ xpk/parser/job.py,sha256=5RdE70rucGfrsn65l7Ho6RmO06mag1S0AO-3saVuXyw,4328
 xpk/parser/kind.py,sha256=sgPCqNVrgmFLcOBEbhlaphwVXxMh_opP9ntCq4KPePE,2682
 xpk/parser/run.py,sha256=oi_ksSyJ8Ooffe2EgoV_ecpmXEmNGVotjpIQH-HjufE,1481
 xpk/parser/shell.py,sha256=VC8p-kz9XjJZW9DXZ-rnv41XnRDRpQRFywHpB5j7tfc,1970
-xpk/parser/storage.py,sha256=-0xN2OaDtQZpdFQskm-v2Bd1yLiBA-AGSNZxs6UOB7A,8996
+xpk/parser/storage.py,sha256=2CLL7TW2rclAtxk0klQmouR-BWoLUcEYLa6ZvIkHRs0,9258
 xpk/parser/validators.py,sha256=-NBZelvfwZRzjz-YUCreD8EzMLHll8PZM-d-MVm2PG4,1192
 xpk/parser/version.py,sha256=eJo4PAbbmRQZulgKBs_ytbVgV9zAaaXeNzMMxmgFMVY,769
 xpk/parser/workload.py,sha256=GNcJEOvldVHKZPIO6cXAIXMpyHq2M9kdOJ7CZP86saU,24177
@@ -84,9 +84,9 @@ xpk/utils/objects.py,sha256=OwMNxB4TGX21qnJPdZo2YBMPMbQPqOtHMh19QhoRNRY,2498
 xpk/utils/templates.py,sha256=g8zgR1MxyJmTmzM_wnvH30FmcbgQMC47UQwBtLj8B9k,807
 xpk/utils/validation.py,sha256=bSJApIY0Lk48I4EEQP08ZUvolXt_APpYXVGJXFQ_YLA,2711
 xpk/utils/yaml.py,sha256=j8xuAJ9yAAwnQi6ozwZ-nMnDyDnc3xWkeBZMtSuP4RU,844
-xpk-0.7.0.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-xpk-0.7.0.dist-info/METADATA,sha256=9BSoO9HYN_txLxZVtxBdl2ZObOzWsHBKNyn-sUHJoA0,63339
-xpk-0.7.0.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
-xpk-0.7.0.dist-info/entry_points.txt,sha256=mzEtiIesFkT1kmcTUVDA1o3uOhiniX6tIz2wmOlMu1M,38
-xpk-0.7.0.dist-info/top_level.txt,sha256=aDe4N0jicmuWExx_6w0TxWQJaEuPSs9BnLU-3aF1GLo,4
-xpk-0.7.0.dist-info/RECORD,,
+xpk-0.7.2.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+xpk-0.7.2.dist-info/METADATA,sha256=rzXsUzC86TBMyfXBRMKTOHiwX_e_wA6V8Lb0giiylBw,63800
+xpk-0.7.2.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+xpk-0.7.2.dist-info/entry_points.txt,sha256=mzEtiIesFkT1kmcTUVDA1o3uOhiniX6tIz2wmOlMu1M,38
+xpk-0.7.2.dist-info/top_level.txt,sha256=aDe4N0jicmuWExx_6w0TxWQJaEuPSs9BnLU-3aF1GLo,4
+xpk-0.7.2.dist-info/RECORD,,

{xpk-0.7.0.dist-info → xpk-0.7.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (76.1.0)
+Generator: setuptools (78.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any