Fix: Quote annotations (llm-d#483)

* Quote annotations

* Also escape labels

Author: sjmonson

setup/functions.py

@@ -1196,7 +1196,7 @@ def add_annotations(varname: str) -> str:
     for entry in annotations.split(","):
         if ":" in entry:
             key, value = entry.split(":", 1)
-            annotation_lines.append(f"{indent}{key.strip()}: {value.strip()}")
+            annotation_lines.append(f"{indent}{key.strip()}: \"{value.strip()}\"")
 
     return "\n".join(annotation_lines)
 

setup/functions.sh

@@ -207,7 +207,7 @@ function add_annotations {
   local varname=$1
 
   for entry in $(echo ${!varname} | $LLMDBENCH_CONTROL_SCMD -e 's^\,^\n^g'); do
-    output=$output"REPLACE_NEWLINEREPLACE_SPACESN$(echo ${entry} | $LLMDBENCH_CONTROL_SCMD -e 's^:^: ^g')"
+    output=$output"REPLACE_NEWLINEREPLACE_SPACESN$(echo ${entry} | $LLMDBENCH_CONTROL_SCMD -e 's^:\(.*\)^: "\1"^g')"
   done
 
   if [[ $LLMDBENCH_CONTROL_ENVIRONMENT_TYPE_STANDALONE_ACTIVE -eq 1 ]]; then

setup/steps/06_deploy_vllm_standalone_models.py

@@ -197,9 +197,9 @@ def generate_deployment_yaml(ev, model, model_label):
   name: vllm-standalone-{model_label}
   labels:
     app: vllm-standalone-{model_label}
-    stood-up-by: {ev['control_username']}
+    stood-up-by: "{ev['control_username']}"
     stood-up-from: llm-d-benchmark
-    stood-up-via: {ev['deploy_methods']}
+    stood-up-via: "{ev['deploy_methods']}"
   namespace: {ev['vllm_common_namespace']}
 spec:
   replicas: {ev['vllm_common_replicas']}
@@ -332,9 +332,9 @@ def generate_service_yaml(ev, model, model_label):
   name: vllm-standalone-{model_label}
   namespace: {ev['vllm_common_namespace']}
   labels:
-    stood-up-by: {ev['control_username']}
+    stood-up-by: "{ev['control_username']}"
     stood-up-from: llm-d-benchmark
-    stood-up-via: {ev['deploy_methods']}
+    stood-up-via: "{ev['deploy_methods']}"
 spec:
   ports:
   - name: http