Addressing comments

Author: ChristianZaccaria

src/codeflare_sdk/templates/base-template.yaml

@@ -121,11 +121,6 @@ spec:
                     valueFrom:
                       fieldRef:
                         fieldPath: status.podIP
-                  - name: COOKIE_SECRET
-                    valueFrom:
-                      secretKeyRef:
-                        key: cookie_secret
-                        name: jobtest-oauth-config
                   - name: RAY_USE_TLS
                     value: "0"
                   - name: RAY_TLS_SERVER_CERT

src/codeflare_sdk/utils/generate_yaml.py

@@ -230,12 +230,18 @@ def update_names(yaml, item, appwrapper_name, cluster_name, namespace, openshift
     lower_meta["namespace"] = namespace
     lower_spec = item.get("generictemplate", {}).get("spec")
     if openshift_oauth:
-        lower_spec["headGroupSpec"]["template"]["spec"]["containers"][0]["env"][1][
-            "valueFrom"
-        ]["secretKeyRef"]["name"] = f"{cluster_name}-oauth-config"
-    if not openshift_oauth:
-        del lower_spec["headGroupSpec"]["template"]["spec"]["containers"][0]["env"][1]
-
+        cookie_secret_env_var = {
+            "name": "COOKIE_SECRET",
+            "valueFrom": {
+              "secretKeyRef": {
+                "key": "cookie_secret",
+                "name": f"{cluster_name}-oauth-config",
+                }
+            }
+        }
+        lower_spec["headGroupSpec"]["template"]["spec"]["containers"][0]["env"].append(
+            cookie_secret_env_var
+        )
 
 def update_labels(yaml, instascale, instance_types):
     metadata = yaml.get("metadata")
@@ -443,7 +449,7 @@ def enable_local_interactive(resources, cluster_name, namespace, ingress_domain)
     # update_tls_env
     item["generictemplate"]["spec"]["headGroupSpec"]["template"]["spec"]["containers"][
         0
-    ]["env"][2]["value"] = "1"
+    ]["env"][1]["value"] = "1"
     item["generictemplate"]["spec"]["workerGroupSpecs"][0]["template"]["spec"][
         "containers"
     ][0]["env"][1]["value"] = "1"

tests/unit_test.py

@@ -2793,11 +2793,11 @@ def test_enable_local_interactive(mocker):
     # 3. Required Envs to enable TLS encryption between head and workers
     for i in range(len(tls_env)):
         assert (
-            head_group_spec["template"]["spec"]["containers"][0]["env"][i + 2]["name"]
+            head_group_spec["template"]["spec"]["containers"][0]["env"][i + 1]["name"]
             == tls_env[i]["name"]
         )
         assert (
-            head_group_spec["template"]["spec"]["containers"][0]["env"][i + 2]["value"]
+            head_group_spec["template"]["spec"]["containers"][0]["env"][i + 1]["value"]
             == tls_env[i]["value"]
         )
         assert (