Remove creation of OAuth resources/logic and add annotation

Author: ChristianZaccaria

src/codeflare_sdk/templates/base-template.yaml

@@ -42,6 +42,7 @@ spec:
         metadata:
           annotations:
             sdk.codeflare.dev/local_interactive: "False"
+            codeflare.dev/oauth: 'False'
           labels:
             workload.codeflare.dev/appwrapper: "aw-kuberay"
             controller-tools.k8s.io: "1.0"

src/codeflare_sdk/utils/generate_yaml.py

@@ -219,12 +219,13 @@ 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_meta["name"] = cluster_name
     lower_meta["namespace"] = namespace
     lower_spec = item.get("generictemplate", {}).get("spec")

tests/test-case-no-mcad.yamls

@@ -3,6 +3,7 @@ apiVersion: ray.io/v1
 kind: RayCluster
 metadata:
   annotations:
+    codeflare.dev/oauth: 'False'
     sdk.codeflare.dev/ingress_domain: apps.cluster.awsroute.org
     sdk.codeflare.dev/local_interactive: 'False'
   labels:

tests/test-case-prio.yaml

@@ -33,6 +33,7 @@ spec:
         kind: RayCluster
         metadata:
           annotations:
+            codeflare.dev/oauth: 'False'
             sdk.codeflare.dev/ingress_domain: apps.cluster.awsroute.org
             sdk.codeflare.dev/local_interactive: 'False'
           labels:

tests/test-case.yaml

@@ -32,6 +32,7 @@ spec:
         kind: RayCluster
         metadata:
           annotations:
+            codeflare.dev/oauth: 'False'
             sdk.codeflare.dev/ingress_domain: apps.cluster.awsroute.org
             sdk.codeflare.dev/local_interactive: 'False'
           labels:

tests/test-default-appwrapper.yaml

@@ -32,6 +32,7 @@ spec:
           annotations:
             sdk.codeflare.dev/ingress_domain: apps.cluster.awsroute.org
             sdk.codeflare.dev/local_interactive: 'False'
+            codeflare.dev/oauth: 'False'
           labels:
             controller-tools.k8s.io: '1.0'
             workload.codeflare.dev/appwrapper: unit-test-default-cluster