update rayclient route generation

Author: MichaelClifford

Diff for: src/codeflare_sdk/templates/new-template.yaml

@@ -161,7 +161,7 @@ spec:
                 - command:
                   - sh
                   - -c
-                  - cd /home/ray/workspace/tls && openssl req -nodes -newkey rsa:2048 -keyout server.key -out server.csr -subj '/CN=ray-head' && printf "authorityKeyIdentifier=keyid,issuer\nbasicConstraints=CA:FALSE\nsubjectAltName = @alt_names\n[alt_names]\nDNS.1 = 127.0.0.1\nDNS.2 = localhost\nDNS.3 = ${RAY_IP}\nDNS.4 = $(awk 'END{print $1}' /etc/hosts)\nDNS.5 = rayclient-deployment-name-$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace).apps.$(grep search /etc/resolv.conf|awk '{print $NF}')">./domain.ext && cp /home/ray/workspace/ca/* . && openssl x509 -req -CA ca.crt -CAkey ca.key -in server.csr -out server.crt -days 365 -CAcreateserial -extfile domain.ext
+                  - cd /home/ray/workspace/tls && openssl req -nodes -newkey rsa:2048 -keyout server.key -out server.csr -subj '/CN=ray-head' && printf "authorityKeyIdentifier=keyid,issuer\nbasicConstraints=CA:FALSE\nsubjectAltName = @alt_names\n[alt_names]\nDNS.1 = 127.0.0.1\nDNS.2 = localhost\nDNS.3 = ${RAY_IP}\nDNS.4 = $(awk 'END{print $1}' /etc/hosts)\nDNS.5 = rayclient-deployment-name-$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace).server-name">./domain.ext && cp /home/ray/workspace/ca/* . && openssl x509 -req -CA ca.crt -CAkey ca.key -in server.csr -out server.crt -days 365 -CAcreateserial -extfile domain.ext
                   image: docker.io/redhat/ubi9
                   name: create-cert
                   securityContext:

Diff for: src/codeflare_sdk/utils/generate_yaml.py

@@ -21,6 +21,7 @@
 import sys
 import argparse
 import uuid
+import openshift as oc
 
 
 def read_template(template):
@@ -235,9 +236,18 @@ def enable_local_interactive(resources, cluster_name, namespace):
     command = item["generictemplate"]["spec"]["headGroupSpec"]["template"]["spec"][
         "initContainers"
     ][0].get("command")[2]
+
+    command = command.replace("deployment-name", cluster_name)
+
+    server_name = (
+        oc.whoami("--show-server").split(":")[1].split("//")[1].replace("api", "apps")
+    )
+
+    command = command.replace("server-name", server_name)
+
     item["generictemplate"]["spec"]["headGroupSpec"]["template"]["spec"][
         "initContainers"
-    ][0]["command"][2] = command.replace("deployment-name", cluster_name)
+    ][0].get("command")[2] = command
 
 
 def disable_raycluster_tls(resources):