Add cpu and memory to covered resources

Author: wstcliyu

src/xpk/core/kueue.py

@@ -469,7 +469,7 @@ def get_kueue_covered_resources_config(
     A string of Kueue covered resources configuration.
   """
   config_format = """
-  - coveredResources: ["{resource_type}"]
+  - coveredResources: ["{resource_type}", "cpu", "memory"]
     flavors:
     - name: {cluster_hardware_name}
       resources:
@@ -479,6 +479,14 @@ def get_kueue_covered_resources_config(
         nominalQuota: 99999999999
       - name: "memory"
         nominalQuota: 9999999Ti
+    - name: cpu-user
+      resources:
+      - name: "{resource_type}"
+        nominalQuota: 0
+      - name: "cpu"
+        nominalQuota: 480
+      - name: "memory"
+        nominalQuota: 2000G
   """
   config_string = config_format.format(
       cluster_hardware_name=cluster_hardware_name,

src/xpk/core/pathways.py

@@ -39,16 +39,16 @@ def add_pw_resource_flavors(args):
 
 def add_pw_resources_to_kueue(args):
   """Add resource flavors required for Pathways, to the cluster queue."""
-  resources_yaml = """- coveredResources: ["cpu", "memory"]
-    flavors:
-    - name: cpu-user
-      resources:
-      - name: "cpu"
-        nominalQuota: 480
-      - name: "memory"
-        nominalQuota: 2000G"""
-  if args.enable_pathways:
-    return resources_yaml
+  # resources_yaml = """- coveredResources: ["cpu", "memory"]
+  #   flavors:
+  #   - name: cpu-user
+  #     resources:
+  #     - name: "cpu"
+  #       nominalQuota: 480
+  #     - name: "memory"
+  #       nominalQuota: 2000G"""
+  # if args.enable_pathways:
+  #   return resources_yaml
   return ''