More improvements to the self-annotate technique

Signed-off-by: Jun Duan <jun.duan.phd@outlook.com>

Author: waltforme

.github/workflows/ci-e2e-openshift.yaml

@@ -510,9 +510,6 @@ jobs:
           kubectl delete launcherpopulationpolicy -n "$FMA_NAMESPACE" -l fma-e2e-instance --ignore-not-found || true
           kubectl delete inferenceserverconfig -n "$FMA_NAMESPACE" -l fma-e2e-instance --ignore-not-found || true
           kubectl delete launcherconfig -n "$FMA_NAMESPACE" -l fma-e2e-instance --ignore-not-found || true
-          kubectl delete rolebinding -n "$FMA_NAMESPACE" -l fma-e2e-instance --ignore-not-found || true
-          kubectl delete role -n "$FMA_NAMESPACE" -l fma-e2e-instance --ignore-not-found || true
-          kubectl delete sa -n "$FMA_NAMESPACE" -l fma-e2e-instance --ignore-not-found || true
           # Wait for test pods to terminate
           sleep 10
           echo "Test objects cleaned up"

inference_server/launcher/launcher_pod_notifier.py

@@ -94,12 +94,8 @@ def get_pod_annotations(
     return pod.metadata.annotations or {}
 
 
-def patch_pod_annotations(
-    api: client.CoreV1Api,
-    namespace: str,
-    pod_name: str,
-    *,
-    signature: str,
+def patch_pod_signature(
+    api: client.CoreV1Api, namespace: str, pod_name: str, signature: str
 ) -> None:
     body = {
         "metadata": {
@@ -109,12 +105,6 @@ def patch_pod_annotations(
         }
     }
     api.patch_namespaced_pod(name=pod_name, namespace=namespace, body=body)
-
-
-def patch_pod_signature(
-    api: client.CoreV1Api, namespace: str, pod_name: str, signature: str
-) -> None:
-    patch_pod_annotations(api, namespace, pod_name, signature=signature)
     logger.info(
         "Published launcher state change",
         extra={"pod": pod_name, "signature": signature},

test/e2e/mkobjs-openshift.sh

@@ -52,7 +52,7 @@ if out=$(kubectl apply "${ns_flag[@]}" -f - 2>&1 <<EOF
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: launcher-sa-$inst
+  name: launcher-$inst
   labels:
     fma-e2e-instance: "$inst"
 ---
@@ -83,7 +83,7 @@ roleRef:
   name: launcher-pod-state-writer-$inst
 subjects:
 - kind: ServiceAccount
-  name: launcher-sa-$inst
+  name: launcher-$inst
 ---
 apiVersion: fma.llm-d.ai/v1alpha1
 kind: InferenceServerConfig
@@ -156,7 +156,7 @@ spec:
   podTemplate:
     spec:
       ${runtime_class}
-      serviceAccountName: launcher-sa-$inst
+      serviceAccountName: launcher-$inst
       containers:
         - name: inference-server
           image: ${LAUNCHER_IMAGE}