Remove creation of OAuth resources/logic and add annotation

Author: ChristianZaccaria

src/codeflare_sdk/cluster/cluster.py

@@ -33,10 +33,7 @@
 )
 from ..utils.kube_api_helpers import _kube_api_error_handling
 from ..utils.generate_yaml import is_openshift_cluster
-from ..utils.openshift_oauth import (
-    create_openshift_oauth_objects,
-    delete_openshift_oauth_objects,
-)
+
 from .config import ClusterConfiguration
 from .model import (
     AppWrapper,
@@ -226,10 +223,6 @@ def up(self):
         the MCAD queue.
         """
         namespace = self.config.namespace
-        if self.config.openshift_oauth:
-            create_openshift_oauth_objects(
-                cluster_name=self.config.name, namespace=namespace
-            )
 
         try:
             config_check()
@@ -281,11 +274,6 @@ def down(self):
         except Exception as e:  # pragma: no cover
             return _kube_api_error_handling(e)
 
-        if self.config.openshift_oauth:
-            delete_openshift_oauth_objects(
-                cluster_name=self.config.name, namespace=namespace
-            )
-
     def status(
         self, print_to_console: bool = True
     ) -> Tuple[CodeFlareClusterStatus, bool]:

src/codeflare_sdk/templates/base-template.yaml

@@ -40,6 +40,8 @@ spec:
         apiVersion: ray.io/v1
         kind: RayCluster
         metadata:
+          annotations:
+            codeflare.dev/oauth: 'False'
           labels:
             workload.codeflare.dev/appwrapper: "aw-kuberay"
             controller-tools.k8s.io: "1.0"
@@ -169,6 +171,12 @@ spec:
                   - mountPath: /etc/ssl/certs/odh-ca-bundle.crt
                     name: odh-ca-cert
                     subPath: odh-ca-bundle.crt
+                  env:
+                  - name: COOKIE_SECRET
+                    valueFrom:
+                      secretKeyRef:
+                        name: jobtest-oauth-config
+                        key: cookie_secret
                 initContainers:
                 - command:
                   - sh

src/codeflare_sdk/utils/generate_yaml.py

@@ -219,12 +219,17 @@ def update_rayclient_ingress(
     spec["rules"][0]["host"] = f"rayclient-{cluster_name}-{namespace}.{ingress_domain}"
 
 
-def update_names(yaml, item, appwrapper_name, cluster_name, namespace):
+def update_names(yaml, item, appwrapper_name, cluster_name, namespace, openshift_oauth):
     metadata = yaml.get("metadata")
     metadata["name"] = appwrapper_name
     metadata["namespace"] = namespace
     lower_meta = item.get("generictemplate", {}).get("metadata")
     lower_meta["labels"]["workload.codeflare.dev/appwrapper"] = appwrapper_name
+    lower_meta["annotations"]["codeflare.dev/oauth"] = f"{openshift_oauth}"
+    lower_spec = item.get("generictemplate", {}).get("spec")
+    lower_spec["headGroupSpec"]["template"]["spec"]["containers"][0]["env"][-1][
+        "valueFrom"
+    ]["secretKeyRef"]["name"] = f"{cluster_name}-oauth-config"
     lower_meta["name"] = cluster_name
     lower_meta["namespace"] = namespace
 
@@ -694,7 +699,9 @@ def generate_appwrapper(
     item = resources["resources"].get("GenericItems")[0]
     ingress_item = resources["resources"].get("GenericItems")[1]
     route_item = resources["resources"].get("GenericItems")[2]
-    update_names(user_yaml, item, appwrapper_name, cluster_name, namespace)
+    update_names(
+        user_yaml, item, appwrapper_name, cluster_name, namespace, openshift_oauth
+    )
     update_labels(user_yaml, instascale, instance_types)
     update_priority(user_yaml, item, dispatch_priority, priority_val)
     update_custompodresources(