xpk 0.17.0__py3-none-any.whl → 0.17.2__py3-none-any.whl

xpk/commands/storage.py

@@ -23,7 +23,6 @@ from kubernetes.client.rest import ApiException
 
 from ..core import gcsfuse
 from ..core.cluster import (
-    DEFAULT_NAMESPACE,
     add_zone_and_project,
     get_cluster_network,
     setup_k8s_env,
@@ -35,12 +34,6 @@ from ..core.cluster import (
     update_cluster_with_workload_identity_if_necessary,
 )
 from ..core.filestore import FilestoreClient, get_storage_class_name
-from ..core.kjob import (
-    KJOB_API_GROUP_NAME,
-    KJOB_API_GROUP_VERSION,
-    KJOB_API_VOLUME_BUNDLE_PLURAL,
-    create_volume_bundle_instance,
-)
 from ..core.storage import (
     GCP_FILESTORE_TYPE,
     GCS_FUSE_TYPE,
@@ -98,9 +91,6 @@ def storage_create(args: Namespace) -> None:
 
     k8s_api_client = setup_k8s_env(args)
     create_storage_crds(k8s_api_client, args, manifest)
-    create_volume_bundle_instance(
-        k8s_api_client, args.name, manifest, args.readonly, args.mount_point
-    )
     # Not required for Filestore. Will be uncommented when adding GCSFuse create
     # return_code = update_cluster_with_workload_identity_if_necessary(args)
     # if return_code > 0:
@@ -214,9 +204,6 @@ def storage_attach(args: Namespace) -> None:
 
   k8s_api_client = setup_k8s_env(args)
   create_storage_crds(k8s_api_client, args, manifest)
-  create_volume_bundle_instance(
-      k8s_api_client, args.name, manifest, args.readonly, args.mount_point
-  )
 
   enable_csi_drivers_if_necessary(args)
 
@@ -332,18 +319,6 @@ def delete_storage_resources(k8s_api_client: ApiClient, storage: Storage):
         "Storage Class",
     )
 
-  delete_resource(
-      lambda name: api_instance.delete_namespaced_custom_object(
-          namespace=DEFAULT_NAMESPACE,
-          name=name,
-          group=KJOB_API_GROUP_NAME,
-          version=KJOB_API_GROUP_VERSION,
-          plural=KJOB_API_VOLUME_BUNDLE_PLURAL,
-      ),
-      storage.name,
-      "VolumeBundle",
-  )
-
   delete_resource(
       lambda name: api_instance.delete_cluster_custom_object(
           name=name,

xpk/commands/workload.py

@@ -493,6 +493,7 @@ def workload_create(args) -> None:
           podFailurePolicy:
             rules:
             - action: FailJob
+              onPodConditions: []
               onExitCodes:
                 containerName: {get_main_container_docker_image(args, workload_system)}
                 operator: NotIn

xpk/core/cluster.py

@@ -717,10 +717,8 @@ def get_cluster_credentials(args) -> int:
       location=location,
       dns_endpoint=True,
   )
-  if return_code != 0:
-    return return_code
 
-  if not _are_credentials_valid():
+  if return_code != 0 or not _are_credentials_valid():
     xpk_print('Detected error. Retrying without --dns-endpoint flag...')
     return_code = _get_credentials(
         project=args.project,

xpk/parser/common.py

@@ -180,157 +180,6 @@ def add_global_arguments(custom_parser_or_group: ParserOrArgumentGroup):
   )
 
 
-def add_slurm_arguments(custom_parser_or_group: ParserOrArgumentGroup):
-  """Add Slurm job arguments to the parser.
-
-  Args:
-    custom_parser_or_group: parser or argument group to add global arguments to.
-  """
-  custom_parser_or_group.add_argument(
-      '--ignore-unknown-flags',
-      type=bool,
-      action=argparse.BooleanOptionalAction,
-      default=False,
-      help='Ignore all the unsupported flags in the bash script.',
-  )
-  custom_parser_or_group.add_argument(
-      '-a',
-      '--array',
-      type=str,
-      default=None,
-      help=(
-          'Submit a job array, multiple jobs to be executed with identical'
-          ' parameters. The indexes specification identifies what array index'
-          ' values should be used. For example, "--array=0-15" or'
-          ' "--array=0,6,16-32". Multiple values may be specified using a comma'
-          ' separated list and/or a range of values with a "-" separator. For'
-          ' example "--array=0-15%%4" will limit the number of simultaneously'
-          ' running tasks from this job array to 4. The minimum index value is'
-          ' 0. The maximum index value is 2147483647.'
-      ),
-  )
-  custom_parser_or_group.add_argument(
-      '-c',
-      '--cpus-per-task',
-      type=str,
-      default=None,
-      help='How much cpus a container inside a pod requires.',
-  )
-  custom_parser_or_group.add_argument(
-      '--gpus-per-task',
-      type=str,
-      default=None,
-      help='How much gpus a container inside a pod requires.',
-  )
-  custom_parser_or_group.add_argument(
-      '--mem',
-      type=str,
-      default=None,
-      help='How much memory a pod requires.',
-  )
-  custom_parser_or_group.add_argument(
-      '--mem-per-task',
-      type=str,
-      default=None,
-      help='How much memory a container requires.',
-  )
-  custom_parser_or_group.add_argument(
-      '--mem-per-cpu',
-      type=str,
-      default=None,
-      help=(
-          'How much memory a container requires, it multiplies the number '
-          'of requested cpus per task by mem-per-cpu.'
-      ),
-  )
-  custom_parser_or_group.add_argument(
-      '--mem-per-gpu',
-      type=str,
-      default=None,
-      help=(
-          'How much memory a container requires, it multiplies the number '
-          'of requested gpus per task by mem-per-gpu.'
-      ),
-  )
-  custom_parser_or_group.add_argument(
-      '-N',
-      '--nodes',
-      type=int,
-      default=None,
-      help='Number of pods to be used at a time.',
-  )
-  custom_parser_or_group.add_argument(
-      '-n',
-      '--ntasks',
-      type=int,
-      default=None,
-      help='Number of identical containers inside of a pod, usually 1.',
-  )
-  custom_parser_or_group.add_argument(
-      '-o',
-      '--output',
-      type=str,
-      default=None,
-      help=(
-          'Where to redirect the standard output stream of a task. If not'
-          ' passed it proceeds to stdout, and is available via kubectl logs.'
-      ),
-  )
-  custom_parser_or_group.add_argument(
-      '-e',
-      '--error',
-      type=str,
-      default=None,
-      help=(
-          'Where to redirect std error stream of a task. If not passed it'
-          ' proceeds to stdout, and is available via kubectl logs.'
-      ),
-  )
-  custom_parser_or_group.add_argument(
-      '--input',
-      type=str,
-      default=None,
-      help='What to pipe into the script.',
-  )
-  custom_parser_or_group.add_argument(
-      '-J',
-      '--job-name',
-      type=str,
-      default=None,
-      help='What is the job name.',
-  )
-  custom_parser_or_group.add_argument(
-      '-D',
-      '--chdir',
-      type=str,
-      default=None,
-      help='Change directory before executing the script.',
-  )
-  custom_parser_or_group.add_argument(
-      '-t',
-      '--time',
-      type=str,
-      default=None,
-      help=(
-          'Set a limit on the total run time of the job. '
-          'A time limit of zero requests that no time limit be imposed. '
-          'Acceptable time formats include "minutes", "minutes:seconds", '
-          '"hours:minutes:seconds", "days-hours", "days-hours:minutes" '
-          'and "days-hours:minutes:seconds".'
-      ),
-  )
-  custom_parser_or_group.add_argument(
-      '--priority',
-      type=str,
-      default='medium',
-      choices=['very-low', 'low', 'medium', 'high', 'very-high'],
-      help=(
-          'A priority, one of `very-low`, `low`, `medium`, `high` or'
-          ' `very-high`. Defaults to `medium`.'
-      ),
-  )
-
-
 def add_tpu_type_argument(
     custom_parser_or_group: ParserOrArgumentGroup,
     required: bool = False,

{xpk-0.17.0.dist-info → xpk-0.17.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xpk
-Version: 0.17.0
+Version: 0.17.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

{xpk-0.17.0.dist-info → xpk-0.17.2.dist-info}/RECORD

@@ -36,14 +36,14 @@ xpk/commands/managed_ml_diagnostics.py,sha256=87wmFbnYQY-kEpJfPo1Up53xM5P_P5wOlX
 xpk/commands/managed_ml_diagnostics_test.py,sha256=pQ1YUGMGRQFJYTS_1o9YyGUzYdLaBdA84LjbnncaeEo,3828
 xpk/commands/run.py,sha256=D0zgmnGeBLATphYhzQj29EScxrMmAKqPRhP6nfWuYcY,4085
 xpk/commands/shell.py,sha256=mRHMwm3Izzsue4bocekm82Rg_cPUaGMClSlvNzNXQ-o,4467
-xpk/commands/storage.py,sha256=kPViq6mrfGeAJwScdMs_kUJg-QxEO6SrEvyBbXhCzEI,11439
+xpk/commands/storage.py,sha256=cSTJN9Mjvdsvk_Nk43kVdQFhp89nxWbanDsTOGZCkpQ,10708
 xpk/commands/version.py,sha256=k30rdLP9clUM8eeSwRFhpfzSb1qwcQImTfuC59Ed6CA,771
-xpk/commands/workload.py,sha256=346bmRKX5q8R_ZkJAxXbp6ofIZp8NyrwP4OtoWsEGXw,31479
+xpk/commands/workload.py,sha256=l99NRFLs7pXuaLdn5d-Pid-cZulKpB3FNus-HdNDtZw,31513
 xpk/commands/workload_test.py,sha256=iXTY7VR1KrlPZZyh1Zm0N946kIP1iV2Fnqx1NtOYDJU,7274
 xpk/core/__init__.py,sha256=YPwWBbgLAu7L-YlTVGB2r8ZV4TzypURMRBcehSHHlLY,561
 xpk/core/capacity.py,sha256=_TyWayBkNU8fBpz1LTbCddEFZiZW5Qz-xmJnQMsXh0c,10534
 xpk/core/capacity_test.py,sha256=jZjMHTYlFLdAmBN1t9k29iABCSE5hlW0--q7QLDQpfQ,4330
-xpk/core/cluster.py,sha256=zAv46s-UB2r-I6cSkH7YzwAkGgD8Vxn7dJsXb_CMEQI,24062
+xpk/core/cluster.py,sha256=3nl77I_MgQpBZsZSzsiQ_7IyFRzfLrYNRUL1gsSNhKU,24036
 xpk/core/cluster_private.py,sha256=RLi0C7bV0NEUXl6QKQzvUT0weN9EdqPvjuuOQsNO0DY,6868
 xpk/core/cluster_test.py,sha256=J4Wk7E--ik_IsWWzL_iWGWbx99Ih03m-0bs-uU7gGDg,5853
 xpk/core/commands.py,sha256=at73VJHdZ4rVA8uvW997tNrvnCjP9v6zaw96bU0kd74,10841
@@ -59,7 +59,6 @@ xpk/core/gcloud_context_test.py,sha256=M8rp6S1zaEcAI7u4Bt8ukWKzv82HH5h9oYVojBcKg
 xpk/core/gcluster_manager.py,sha256=lyv_MvdnkByy9_PEBj_ugAEBwnCbFNiWTSrEFjrMlPc,6236
 xpk/core/gcsfuse.py,sha256=kg5pgxdTjgiqquuGjev9fXzJPb8oiWPTK6wzCddzheQ,2125
 xpk/core/jobset.py,sha256=PJ4Fd8TNNLuYKNOMehoMYRIUEXyc5jsbHctJGqfW_8Y,4037
-xpk/core/kjob.py,sha256=Ustta_ygXaacmgb1Av6QW4Epw0S_r-b-tjrMA6uNVj0,14240
 xpk/core/kueue_manager.py,sha256=JB8DcD-RFvBdC9Mk_DDCAkI2Km8W5-KMTRMVec06LlM,20010
 xpk/core/kueue_manager_test.py,sha256=FfBd1vninU_fcJ9wZev45-vpEsH12a9-XKysk_h4auo,22008
 xpk/core/monitoring.py,sha256=__bzTq_DIDAK8yIaN4F3MJh-yjYw5X1OlxmRgYOpf1g,4332
@@ -109,7 +108,7 @@ xpk/parser/__init__.py,sha256=YPwWBbgLAu7L-YlTVGB2r8ZV4TzypURMRBcehSHHlLY,561
 xpk/parser/batch.py,sha256=mJU-Cp1yTLje59vD-B1IiBcUeD-ZmEsoeB4xhj9cflc,1406
 xpk/parser/cluster.py,sha256=U2T-Q4yS86PWeFLNfknYWDDzZfubCKqIhqasxKLmErI,31342
 xpk/parser/cluster_test.py,sha256=xzQEC3IeAMpwsbNbHLuaNKxR3iaZcm3z4m3i61G62d4,6581
-xpk/parser/common.py,sha256=w6u6rqCOO23572C99PV1N8Fsp-vTP0C7Kv5tdWGEQO8,11691
+xpk/parser/common.py,sha256=sJYGjrn2YgFxelDCYB18s1R8Md8GpDcMQNoAezxDDIs,7257
 xpk/parser/common_test.py,sha256=_6Fm2pUF7h4K0G5qxGabXSYr4ng9ihOzlViE6oLQwQs,1557
 xpk/parser/config.py,sha256=-XnWx9aFsBW4Uzo_hpOMD2ZQ0bdZLvq1ksv83_5jqSM,1633
 xpk/parser/core.py,sha256=VRJerlS92ufoQbG1mZv7B04DAP4qGkBHa4pRXgcbAs0,4761
@@ -139,7 +138,6 @@ xpk/templates/kueue_sub_slicing_topology.yaml.j2,sha256=UXjpRFqCIcoebwcMeD9Lo4fe
 xpk/templates/kueue_super_slicing_topology.yaml.j2,sha256=4WkSfQ2A5-jnKWiHWj2WXlv4sQmAcfxzbJCW-cWUE8E,264
 xpk/templates/mtc-cpc.yaml,sha256=MPx75tog09kjRAvHoNOPCEobigQ17d7pYCUnZCevSDQ,340
 xpk/templates/storage.yaml,sha256=AykdyMtDnKZF8Y_0BYxoYP03hEIzEk6iNalXAQHgAls,163
-xpk/templates/volume_bundle.yaml,sha256=sqeag7GPWqGNQ5doZtO9IVAX_vKYRO73-aBE7waEtSY,129
 xpk/utils/__init__.py,sha256=YPwWBbgLAu7L-YlTVGB2r8ZV4TzypURMRBcehSHHlLY,561
 xpk/utils/console.py,sha256=AJWSyjuWyLjb7SYt8kPb0gw9N84EN9LbLxYCXjC-6Ds,2464
 xpk/utils/console_test.py,sha256=x1v7v9VrIZwAKH-eOzj1lAY4EsHxJ6ruhfEOzpssO6o,2944
@@ -162,9 +160,9 @@ xpk/utils/validation.py,sha256=irL9579RbvwxiGn1t3zhhPo-0oHgdUPOSYsUuFqsDSM,3039
 xpk/utils/validation_test.py,sha256=PEDSMUqZdt_Lx1FSR-LOTXKKtsJ47JH1fxugM0Gfz6Y,1168
 xpk/utils/versions.py,sha256=_Ep68W70a9605XjiaOOpBa9Is9jXlsoOiwL8v5Xt-WA,897
 xpk/utils/yaml.py,sha256=j8xuAJ9yAAwnQi6ozwZ-nMnDyDnc3xWkeBZMtSuP4RU,844
-xpk-0.17.0.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-xpk-0.17.0.dist-info/METADATA,sha256=a7flD2BsWV8tLk6cxCMvnYvLeJMMChu4TpyGfP1QbH8,7930
-xpk-0.17.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-xpk-0.17.0.dist-info/entry_points.txt,sha256=mzEtiIesFkT1kmcTUVDA1o3uOhiniX6tIz2wmOlMu1M,38
-xpk-0.17.0.dist-info/top_level.txt,sha256=TQKZWgV7LSElvmunYT9V_627qOMoxq3qYzWAFzKudB8,16
-xpk-0.17.0.dist-info/RECORD,,
+xpk-0.17.2.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+xpk-0.17.2.dist-info/METADATA,sha256=_G5EPL08DVbtGWPXVmHAg_HxH_-op5be3Fx1rWRJiwI,7930
+xpk-0.17.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+xpk-0.17.2.dist-info/entry_points.txt,sha256=mzEtiIesFkT1kmcTUVDA1o3uOhiniX6tIz2wmOlMu1M,38
+xpk-0.17.2.dist-info/top_level.txt,sha256=TQKZWgV7LSElvmunYT9V_627qOMoxq3qYzWAFzKudB8,16
+xpk-0.17.2.dist-info/RECORD,,

xpk/core/kjob.py

@@ -1,473 +0,0 @@
-"""
-Copyright 2024 Google LLC
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-     https://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-"""
-
-from argparse import Namespace
-from enum import Enum
-
-import yaml
-from kubernetes import client as k8s_client
-from kubernetes.client import ApiClient
-from kubernetes.client.rest import ApiException
-
-from ..utils import templates
-from ..utils.execution_context import is_dry_run
-from ..utils.console import xpk_exit, xpk_print
-from .cluster import DEFAULT_NAMESPACE, XPK_SA, setup_k8s_env
-from .commands import (
-    run_command_for_value,
-    run_command_with_updates,
-    run_kubectl_apply,
-)
-from .config import (
-    KJOB_BATCH_IMAGE,
-    KJOB_BATCH_WORKING_DIRECTORY,
-    KJOB_SHELL_IMAGE,
-    KJOB_SHELL_INTERACTIVE_COMMAND,
-    KJOB_SHELL_WORKING_DIRECTORY,
-    get_config,
-)
-from .network import get_cluster_subnetworks
-from .system_characteristics import AcceleratorType, SystemCharacteristics
-from .resources import get_cluster_system_characteristics
-from .storage import (
-    GCS_FUSE_ANNOTATIONS,
-    PARALLELSTORE_ANNOTATIONS,
-    get_auto_mount_gcsfuse_storages,
-    get_auto_mount_parallelstore_storages,
-    get_auto_mount_storages,
-)
-from .workload_decorators import (
-    rdma_decorator,
-    tcpxo_decorator,
-)
-from .workload_decorators.tcpxo_decorator import get_tcpxo_deamon_entry
-
-KJOB_API_GROUP_NAME = "kjobctl.x-k8s.io"
-KJOB_API_GROUP_VERSION = "v1alpha1"
-KJOB_API_VOLUME_BUNDLE_PLURAL = "volumebundles"
-VOLUME_BUNDLE_TEMPLATE_PATH = "/../templates/volume_bundle.yaml"
-
-
-class AppProfileDefaults(Enum):
-  NAME = "xpk-def-app-profile"
-
-
-class JobTemplateDefaults(Enum):
-  NAME = "xpk-def-batch"
-  PARALLELISM = 1
-  COMPLETIONS = 1
-  CONTAINER_NAME = "xpk-batch-container"
-  IMAGE = "ubuntu:22.04"
-  WORKING_DIRECTORY = "/"
-
-
-class PodTemplateDefaults(Enum):
-  NAME = "xpk-def-pod"
-  CONTAINER_NAME = "xpk-interactive-container"
-  IMAGE = "busybox:1.28"
-  WORKING_DIRECTORY = "/"
-  INTERACTIVE_COMMAND = "/bin/sh"
-
-
-job_template_yaml = """
-  apiVersion: kjobctl.x-k8s.io/v1alpha1
-  kind: JobTemplate
-  metadata:
-    name: {name}
-    namespace: default
-  template:
-    spec:
-      parallelism: {parallelism}
-      completions: {completions}
-      completionMode: Indexed
-      template:
-        spec:
-          dnsPolicy: ClusterFirstWithHostNet
-          tolerations:
-            - operator: "Exists"
-              key: nvidia.com/gpu
-          containers:
-            - name: {container_name}
-              image: {image}
-              workingDir: {working_directory}
-              {resources}
-          {node_selector}
-          priorityClassName: {priority}
-          restartPolicy: OnFailure
-          serviceAccountName: {service_account}
-"""
-job_node_selector_template = """
-          nodeSelector:
-            cloud.google.com/gke-accelerator: {gpu_name}
-"""
-job_resources_template = """
-              resources:
-                limits:
-                  nvidia.com/gpu: {gpu_per_node}
-"""
-
-app_profile_yaml = """
-apiVersion: kjobctl.x-k8s.io/v1alpha1
-kind: ApplicationProfile
-metadata:
-  name: {name}
-  namespace: default
-spec:
-  supportedModes:
-    - name: Slurm
-      template: {batch_template}
-      requiredFlags: []
-    - name: Interactive
-      template: {interactive_template}
-  volumeBundles: {volume_bundles}
-"""
-
-pod_template_yaml = """
-apiVersion: v1
-kind: PodTemplate
-metadata:
-  name: {name}
-  namespace: default
-template:
-  spec:
-    tolerations:
-      - effect: NoSchedule
-        key: components.gke.io/gke-managed-components
-        operator: Equal
-        value: "true"
-    containers:
-      - name: {container_name}
-        image: {image}
-        command: [{interactive_command}]
-        workingDir: {working_directory}
-    initContainers:
-      - name: init
-        image: {image}
-        command: ['/bin/mkdir', '-p', '{working_directory}']
-    serviceAccountName: {service_account}
-"""
-
-Kueue_TAS_annotation = "kueue.x-k8s.io/podset-preferred-topology=cloud.google.com/gce-topology-host"
-
-default_interface_annotation = "networking.gke.io/default-interface=eth0"
-
-
-def get_a4_pod_template_annotations() -> tuple[str, str]:
-  sub_networks = get_cluster_subnetworks()
-  interfaces_key, interfaces_value = rdma_decorator.get_interfaces_entry(
-      sub_networks
-  )
-
-  return (
-      default_interface_annotation,
-      f"{interfaces_key}=$'{interfaces_value}'",
-  )
-
-
-def get_a3ultra_pod_template_annotations() -> tuple[str, str]:
-  sub_networks = get_cluster_subnetworks()
-  interfaces_key, interfaces_value = rdma_decorator.get_interfaces_entry(
-      sub_networks
-  )
-
-  return (
-      default_interface_annotation,
-      f"{interfaces_key}=$'{interfaces_value}'",
-  )
-
-
-def get_a3mega_pod_template_annotations() -> tuple[str, str, str]:
-  """Adds or updates annotations in the Pod template."""
-  sub_networks = get_cluster_subnetworks()
-  tcpxo_deamon_key, tcpxo_deamon_paths = get_tcpxo_deamon_entry()
-  interfaces_key, interfaces_value = tcpxo_decorator.get_interfaces_entry(
-      sub_networks
-  )
-  tcpxo = f"{tcpxo_deamon_key}=$'{tcpxo_deamon_paths}'"
-  interfaces = f"{interfaces_key}=$'{interfaces_value}'"
-  return tcpxo, interfaces, default_interface_annotation
-
-
-def verify_kjob_installed() -> int:
-  """Check if kjob is installed. If not provide user with proper communicate and exit.
-  Returns:
-    error code > if kjob not installed, otherwise 0
-  """
-  command = "kubectl-kjob help"
-  task = "Verify kjob installation "
-  verify_kjob_installed_code, _ = run_command_for_value(command, task)
-
-  if verify_kjob_installed_code == 0:
-    xpk_print("kjob found")
-    return 0
-
-  if verify_kjob_installed_code != 0:
-    xpk_print(
-        " kjob not found. Please follow"
-        " https://github.com/kubernetes-sigs/kjob/blob/main/docs/installation.md"
-        " to install kjob."
-    )
-    return verify_kjob_installed_code
-  return 0
-
-
-def get_pod_template_interactive_command() -> str:
-  """Gets the interactive command for PodTemplate from config otherwise the default value.
-
-  Args:
-    args - user provided arguments
-  Returns:
-    str - PodTemplate's interactive command
-  """
-  pod_command = get_config().get(KJOB_SHELL_INTERACTIVE_COMMAND)
-  if pod_command is None or len(pod_command) == 0:
-    pod_command = PodTemplateDefaults.INTERACTIVE_COMMAND.value
-
-  return pod_command
-
-
-def create_app_profile_instance(volume_bundles: list[str]) -> int:
-  """Create new AppProfile instance on cluster with default settings.
-
-  Args:
-    args - user provided arguments
-  Returns:
-    exit_code > 0 if creating AppProfile fails, 0 otherwise
-  """
-  return run_kubectl_apply(
-      yml_string=app_profile_yaml.format(
-          name=AppProfileDefaults.NAME.value,
-          batch_template=JobTemplateDefaults.NAME.value,
-          interactive_template=PodTemplateDefaults.NAME.value,
-          volume_bundles=volume_bundles,
-      ),
-      task="Creating AppProfile",
-  )
-
-
-def decorate_job_template_with_gpu(
-    yml_string: str, system: SystemCharacteristics
-) -> str:
-  job_spec = yaml.safe_load(yml_string)["template"]
-  kjob_decorator = (
-      system.gpu_config.kjob_decorator_fn
-      if system.gpu_config and system.gpu_config.kjob_decorator_fn
-      else None
-  )
-  if kjob_decorator:
-    job_spec = kjob_decorator(job_spec)
-  job_template_dict = yaml.safe_load(yml_string)
-  job_template_dict["template"] = job_spec
-  yaml_result: str = yaml.dump(job_template_dict, sort_keys=False)
-  return yaml_result
-
-
-def create_job_template_instance(
-    args: Namespace,
-    system: SystemCharacteristics | None,
-    service_account: str,
-) -> int:
-  """Create new JobTemplate instance on cluster with default settings.
-
-  Args:
-    args - user provided arguments
-  Returns:
-    exit_code > 0 if creating JobTemplate fails, 0 otherwise
-  """
-  job_image = get_config().get(KJOB_BATCH_IMAGE)
-  if job_image is None or len(job_image) == 0:
-    job_image = JobTemplateDefaults.IMAGE.value
-  working_directory = get_config().get(KJOB_BATCH_WORKING_DIRECTORY)
-  if working_directory is None or len(working_directory) == 0:
-    working_directory = JobTemplateDefaults.WORKING_DIRECTORY.value
-  resources = (
-      job_resources_template.format(gpu_per_node=system.chips_per_vm)
-      if system is not None and system.accelerator_type == AcceleratorType.GPU
-      else ""
-  )
-
-  node_selector = (
-      job_node_selector_template.format(gpu_name=system.gke_accelerator)
-      if system is not None and system.accelerator_type == AcceleratorType.GPU
-      else ""
-  )
-  yml_string = job_template_yaml.format(
-      name=JobTemplateDefaults.NAME.value,
-      parallelism=JobTemplateDefaults.PARALLELISM.value,
-      completions=JobTemplateDefaults.COMPLETIONS.value,
-      container_name=JobTemplateDefaults.CONTAINER_NAME.value,
-      image=job_image,
-      working_directory=working_directory,
-      resources=resources,
-      node_selector=node_selector,
-      priority=args.priority if hasattr(args, "priority") else "medium",
-      service_account=service_account,
-  )
-  if system is not None and system.accelerator_type == AcceleratorType.GPU:
-    yml_string = decorate_job_template_with_gpu(yml_string, system)
-
-  return run_kubectl_apply(
-      yml_string,
-      task="Creating JobTemplate",
-  )
-
-
-def create_pod_template_instance(service_account: str) -> int:
-  """Create new PodTemplate instance on cluster with default settings.
-
-  Returns:
-    exit_code > 0 if creating PodTemplate fails, 0 otherwise
-  """
-  pod_image = get_config().get(KJOB_SHELL_IMAGE)
-  if pod_image is None or len(pod_image) == 0:
-    pod_image = PodTemplateDefaults.IMAGE.value
-  working_directory = get_config().get(KJOB_SHELL_WORKING_DIRECTORY)
-  if working_directory is None or len(working_directory) == 0:
-    working_directory = PodTemplateDefaults.WORKING_DIRECTORY.value
-
-  return run_kubectl_apply(
-      yml_string=pod_template_yaml.format(
-          name=PodTemplateDefaults.NAME.value,
-          container_name=PodTemplateDefaults.CONTAINER_NAME.value,
-          image=pod_image,
-          working_directory=working_directory,
-          interactive_command=get_pod_template_interactive_command(),
-          service_account=service_account,
-      ),
-      task="Creating PodTemplate",
-  )
-
-
-def prepare_kjob(args: Namespace) -> int:
-  system = get_cluster_system_characteristics(args)
-
-  storages = []
-  if not is_dry_run():
-    k8s_api_client = setup_k8s_env(args)
-    storages = get_auto_mount_storages(k8s_api_client)
-
-  service_account = ""
-  if len(storages) > 0:
-    service_account = XPK_SA
-
-  job_err_code = create_job_template_instance(args, system, service_account)
-  if job_err_code > 0:
-    return job_err_code
-  pod_err_code = create_pod_template_instance(service_account)
-  if pod_err_code > 0:
-    return pod_err_code
-
-  volume_bundles = [item.name for item in storages]
-
-  return create_app_profile_instance(volume_bundles)
-
-
-def apply_kjob_crds() -> int:
-  """Apply kjob CRDs on cluster.
-
-  This function install kjob CRDs files from kjobctl printcrds.
-  It creates all neccessary kjob CRDs.
-
-  Returns:
-    None
-  """
-  command = "kubectl kjob printcrds | kubectl apply --server-side -f -"
-  task = "Create kjob CRDs on cluster"
-  return_code = run_command_with_updates(command, task)
-  if return_code != 0:
-    xpk_print(f"{task} returned ERROR {return_code}")
-    return return_code
-  xpk_print("Creating kjob CRDs succeeded")
-  return 0
-
-
-def create_volume_bundle_instance(
-    k8s_api_client: ApiClient,
-    name: str,
-    manifest: list[dict],
-    readonly: bool,
-    mount_point: str,
-) -> None:
-  """
-  Creates a new VolumeBundle resource in the Kubernetes cluster.
-
-  This function reads a VolumeBundle template from a YAML file, populates it with
-  values from the provided arguments, and then creates the VolumeBundle object
-  in the cluster.
-
-  Args:
-      k8s_api_client: An ApiClient object for interacting with the Kubernetes API.
-      args: An argparse Namespace object containing the arguments for creating
-            the Storage resource.
-  """
-  data = templates.load(VOLUME_BUNDLE_TEMPLATE_PATH)
-  data["metadata"]["name"] = name
-  spec = data["spec"]
-  spec["volumes"] = []
-  spec["containerVolumeMounts"] = []
-
-  for obj in manifest:
-    if obj["kind"] == "PersistentVolumeClaim":
-      spec["volumes"].append({
-          "name": obj["metadata"]["name"],
-          "persistentVolumeClaim": {
-              "claimName": obj["metadata"]["name"],
-              "readOnly": readonly,
-          },
-      })
-      spec["containerVolumeMounts"].append({
-          "name": obj["metadata"]["name"],
-          "mountPath": mount_point,
-      })
-
-  data["spec"] = spec
-
-  api_instance = k8s_client.CustomObjectsApi(k8s_api_client)
-  try:
-    api_instance.create_namespaced_custom_object(
-        namespace=DEFAULT_NAMESPACE,
-        group=KJOB_API_GROUP_NAME,
-        version=KJOB_API_GROUP_VERSION,
-        plural=KJOB_API_VOLUME_BUNDLE_PLURAL,
-        body=data,
-    )
-    xpk_print(
-        f"Created {KJOB_API_VOLUME_BUNDLE_PLURAL}.{KJOB_API_GROUP_NAME} object:"
-        f" {data['metadata']['name']}"
-    )
-  except ApiException as e:
-    if e.status == 409:
-      xpk_print(f"VolumeBundle: {name} already exists. Skipping its creation")
-    else:
-      xpk_print(f"Encountered error during VolumeBundle creation: {e}")
-      xpk_exit(1)
-
-
-def get_storage_annotations(args: Namespace) -> list[str]:
-  annotations = []
-  k8s_api_client = setup_k8s_env(args)
-
-  gcsfuse_storages = get_auto_mount_gcsfuse_storages(k8s_api_client)
-  if len(gcsfuse_storages) > 0:
-    for key, value in GCS_FUSE_ANNOTATIONS.items():
-      annotations.append(f"{key}={value}")
-
-  parallelstore_storages = get_auto_mount_parallelstore_storages(k8s_api_client)
-  if len(parallelstore_storages) > 0:
-    for key, value in PARALLELSTORE_ANNOTATIONS.items():
-      annotations.append(f"{key}={value}")
-
-  return annotations

xpk/templates/volume_bundle.yaml

@@ -1,7 +0,0 @@
-apiVersion: kjobctl.x-k8s.io/v1alpha1
-kind: VolumeBundle
-metadata:
-  name: $NAME
-spec:
-  volumes: []
-  containerVolumeMounts: []