diff --git a/goldens/Basic_cluster_create.txt b/goldens/Basic_cluster_create.txt index df7685a99..03fce8269 100644 --- a/goldens/Basic_cluster_create.txt +++ b/goldens/Basic_cluster_create.txt @@ -73,7 +73,7 @@ kubectl wait deploy/kueue-controller-manager -nkueue-system --for=condition=avai [XPK] Install Kueue Custom Resources [XPK] Try 1: Applying Kueue Custom Resources [XPK] Task: `Applying Kueue Custom Resources` is implemented by the following command not running since it is a dry run. -kubectl apply -f 0f9af4fcbf6d012aed0c8e09d49827dc34495d3eed2893af6b68b2d121a519ac +kubectl apply -f c49da377b542c14a80a64a13236f8d3a1c8e022dc7c82cc6f6f0560d980ee9e7 [XPK] Update Kueue Controller Manager resources [XPK] Task: `Count total nodes` is implemented by the following command not running since it is a dry run. kubectl get node --no-headers | wc -l diff --git a/goldens/Cluster_create_private.txt b/goldens/Cluster_create_private.txt index 400b59adb..4c399efab 100644 --- a/goldens/Cluster_create_private.txt +++ b/goldens/Cluster_create_private.txt @@ -80,7 +80,7 @@ kubectl wait deploy/kueue-controller-manager -nkueue-system --for=condition=avai [XPK] Install Kueue Custom Resources [XPK] Try 1: Applying Kueue Custom Resources [XPK] Task: `Applying Kueue Custom Resources` is implemented by the following command not running since it is a dry run. -kubectl apply -f e528cf13756aaba6ef43789e09518fb9bcc6d43a945b51fb76d16e9869c73eec +kubectl apply -f ec56970df5766f33e470374e087b3061d9960c171fce12fdb2d75170eb75fe55 [XPK] Update Kueue Controller Manager resources [XPK] Task: `Count total nodes` is implemented by the following command not running since it is a dry run. kubectl get node --no-headers | wc -l diff --git a/goldens/NAP_cluster-create.txt b/goldens/NAP_cluster-create.txt index dd1df293b..863da3314 100644 --- a/goldens/NAP_cluster-create.txt +++ b/goldens/NAP_cluster-create.txt @@ -84,7 +84,7 @@ kubectl wait deploy/kueue-controller-manager -nkueue-system --for=condition=avai [XPK] Install Kueue Custom Resources [XPK] Try 1: Applying Kueue Custom Resources [XPK] Task: `Applying Kueue Custom Resources` is implemented by the following command not running since it is a dry run. -kubectl apply -f b3843453fb19ae7105126245bac5b63930f46861462cd3a557aea44801a99280 +kubectl apply -f eaa77bda2c85901c627ae9bb4baacdb37df006d6bf267b319b6bc8b2cbf7ca7e [XPK] Update Kueue Controller Manager resources [XPK] Task: `Count total nodes` is implemented by the following command not running since it is a dry run. kubectl get node --no-headers | wc -l diff --git a/goldens/NAP_cluster-create_with_pathways.txt b/goldens/NAP_cluster-create_with_pathways.txt index f0c8ba7f6..58bedcf6f 100644 --- a/goldens/NAP_cluster-create_with_pathways.txt +++ b/goldens/NAP_cluster-create_with_pathways.txt @@ -85,7 +85,7 @@ kubectl wait deploy/kueue-controller-manager -nkueue-system --for=condition=avai [XPK] Install Kueue Custom Resources [XPK] Try 1: Applying Kueue Custom Resources [XPK] Task: `Applying Kueue Custom Resources` is implemented by the following command not running since it is a dry run. -kubectl apply -f 898c7686cc5ef7f026f74e55b73b5843767e3f1abb9639169f02ebc44d06af73 +kubectl apply -f 7ffd24a656c1ec9c1d331862e352cefd5348637b0f776a8e3db888b04fa7fad6 [XPK] Update Kueue Controller Manager resources [XPK] Task: `Count total nodes` is implemented by the following command not running since it is a dry run. kubectl get node --no-headers | wc -l diff --git a/src/xpk/core/kueue.py b/src/xpk/core/kueue.py index 8f8e63c00..fd4b8437d 100644 --- a/src/xpk/core/kueue.py +++ b/src/xpk/core/kueue.py @@ -475,7 +475,6 @@ def install_kueue_crs( ]: yml_string = topology_yaml + yml_string - print(yml_string) tmp = write_tmp_file(yml_string) command = f'kubectl apply -f {str(tmp)}' diff --git a/src/xpk/parser/cluster.py b/src/xpk/parser/cluster.py index ce2fd8260..18dd2d04f 100644 --- a/src/xpk/parser/cluster.py +++ b/src/xpk/parser/cluster.py @@ -174,7 +174,6 @@ def set_cluster_create_parser(cluster_create_parser: ArgumentParser): 'Arguments for configuring MTC in cluster create.', ) add_shared_cluster_create_mtc_arguments(cluster_create_mtc_arguments) - cluster_create_parser.set_defaults(func=cluster_create) cluster_create_resource_limits = cluster_create_parser.add_argument_group( 'Optional Resource Limits Arguments', @@ -182,6 +181,8 @@ def set_cluster_create_parser(cluster_create_parser: ArgumentParser): ) add_resource_limits(cluster_create_resource_limits) + cluster_create_parser.set_defaults(func=cluster_create) + def set_cluster_create_pathways_parser( cluster_create_pathways_parser: ArgumentParser, @@ -251,6 +252,15 @@ def set_cluster_create_pathways_parser( ) ) add_shared_cluster_create_mtc_arguments(cluster_create_mtc_arguments) + + cluster_create_resource_limits = ( + cluster_create_pathways_parser.add_argument_group( + 'Optional Resource Limits Arguments', + 'Arguments for configuring resource limits in cluster create.', + ) + ) + add_resource_limits(cluster_create_resource_limits) + cluster_create_pathways_parser.set_defaults(func=cluster_create_pathways) @@ -326,6 +336,13 @@ def set_cluster_create_ray_parser(cluster_create_ray_parser: ArgumentParser): 'Arguments for configuring MTC in cluster create.', ) add_shared_cluster_create_mtc_arguments(cluster_create_mtc_arguments) + + cluster_create_resource_limits = cluster_create_ray_parser.add_argument_group( + 'Optional Resource Limits Arguments', + 'Arguments for configuring resource limits in cluster create.', + ) + add_resource_limits(cluster_create_resource_limits) + cluster_create_ray_parser.set_defaults(func=cluster_create_ray_cluster)