Remove openshift_oauth configuration

Author: ChristianZaccaria

Diff for: src/codeflare_sdk/cluster/cluster.py

@@ -81,21 +81,18 @@ def _client_headers(self):
             )
         }
 
-    @property
-    def _client_verify_tls(self):
-        return not self.config.openshift_oauth
 
     @property
     def job_client(self):
         k8client = api_config_handler() or client.ApiClient()
         if self._job_submission_client:
             return self._job_submission_client
-        if self.config.openshift_oauth:
+        if is_openshift_cluster():
             print(k8client.configuration.get_api_key_with_prefix("authorization"))
             self._job_submission_client = JobSubmissionClient(
                 self.cluster_dashboard_uri(),
                 headers=self._client_headers,
-                verify=self._client_verify_tls,
+                verify=False,
             )
         else:
             self._job_submission_client = JobSubmissionClient(
@@ -210,7 +207,6 @@ def create_app_wrapper(self):
             image_pull_secrets=image_pull_secrets,
             dispatch_priority=dispatch_priority,
             priority_val=priority_val,
-            openshift_oauth=self.config.openshift_oauth,
             ingress_domain=ingress_domain,
             ingress_options=ingress_options,
             write_to_file=write_to_file,
@@ -351,7 +347,7 @@ def is_dashboard_ready(self) -> bool:
                 self.cluster_dashboard_uri(),
                 headers=self._client_headers,
                 timeout=5,
-                verify=self._client_verify_tls,
+                verify=False,
             )
         except requests.exceptions.SSLError:  # pragma no cover
             # SSL exception occurs when oauth ingress has been created but cluster is not up
@@ -491,23 +487,13 @@ def from_k8_cluster_object(
         rc, mcad=True, ingress_domain=None, ingress_options={}, write_to_file=False
     ):
         config_check()
-        openshift_oauth = False
         if (
             rc["metadata"]["annotations"]["sdk.codeflare.dev/local_interactive"]
             == "True"
         ):
             local_interactive = True
         else:
             local_interactive = False
-        if "codeflare.dev/oauth" in rc["metadata"]["annotations"]:
-            openshift_oauth = (
-                rc["metadata"]["annotations"]["codeflare.dev/oauth"] == "True"
-            )
-        else:
-            for container in rc["spec"]["headGroupSpec"]["template"]["spec"][
-                "containers"
-            ]:
-                openshift_oauth = "oauth-proxy" in container["name"]
         machine_types = (
             rc["metadata"]["labels"]["orderedinstance"].split("_")
             if "orderedinstance" in rc["metadata"]["labels"]
@@ -558,7 +544,6 @@ def from_k8_cluster_object(
             ingress_domain=ingress_domain,
             ingress_options=ingress_options,
             write_to_file=write_to_file,
-            openshift_oauth=openshift_oauth,
         )
         return Cluster(cluster_config)
 

Diff for: src/codeflare_sdk/cluster/config.py

@@ -52,7 +52,6 @@ class ClusterConfiguration:
     local_interactive: bool = False
     image_pull_secrets: list = field(default_factory=list)
     dispatch_priority: str = None
-    openshift_oauth: bool = False  # NOTE: to use the user must have permission to create a RoleBinding for system:auth-delegator
     ingress_options: dict = field(default_factory=dict)
     ingress_domain: str = None
     write_to_file: bool = False

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

@@ -42,7 +42,6 @@ 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"

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

@@ -219,17 +219,16 @@ 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, openshift_oauth):
+def update_names(yaml, item, appwrapper_name, cluster_name, namespace):
     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")
-    if openshift_oauth:
+    if is_openshift_cluster():
         cookie_secret_env_var = {
             "name": "COOKIE_SECRET",
             "valueFrom": {
@@ -600,9 +599,6 @@ def enable_openshift_oauth(user_yaml, cluster_name, namespace):
     )
     # allows for setting value of Cluster object when initializing object from an existing AppWrapper on cluster
     user_yaml["metadata"]["annotations"] = user_yaml["metadata"].get("annotations", {})
-    user_yaml["metadata"]["annotations"][
-        "codeflare-sdk-use-oauth"
-    ] = "true"  # if the user gets an
     ray_headgroup_pod = user_yaml["spec"]["resources"]["GenericItems"][0][
         "generictemplate"
     ]["spec"]["headGroupSpec"]["template"]["spec"]
@@ -711,7 +707,6 @@ def generate_appwrapper(
     image_pull_secrets: list,
     dispatch_priority: str,
     priority_val: int,
-    openshift_oauth: bool,
     ingress_domain: str,
     ingress_options: dict,
     write_to_file: bool,
@@ -723,7 +718,7 @@ def generate_appwrapper(
     ingress_item = resources["resources"].get("GenericItems")[1]
     route_item = resources["resources"].get("GenericItems")[2]
     update_names(
-        user_yaml, item, appwrapper_name, cluster_name, namespace, openshift_oauth
+        user_yaml, item, appwrapper_name, cluster_name, namespace
     )
     update_labels(user_yaml, instascale, instance_types)
     update_priority(user_yaml, item, dispatch_priority, priority_val)
@@ -774,7 +769,7 @@ def generate_appwrapper(
 
     delete_route_or_ingress(resources["resources"])
 
-    if openshift_oauth:
+    if is_openshift_cluster():
         enable_openshift_oauth(user_yaml, cluster_name, namespace)
 
     directory_path = os.path.expanduser("~/.codeflare/appwrapper/")

Diff for: tests/e2e/mnist_raycluster_sdk_oauth_test.py

@@ -51,7 +51,6 @@ def run_mnist_raycluster_sdk_oauth(self):
                 num_gpus=0,
                 instascale=False,
                 image=ray_image,
-                openshift_oauth=True,
                 write_to_file=True,
             )
         )

Diff for: tests/test-case-no-mcad.yamls

@@ -3,7 +3,6 @@ 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:

Diff for: tests/test-case-prio.yaml

@@ -33,7 +33,6 @@ 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:

Diff for: tests/test-case.yaml

@@ -32,7 +32,6 @@ 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:

Diff for: tests/test-default-appwrapper.yaml

@@ -32,7 +32,6 @@ 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

Diff for: tests/unit_test.py

@@ -3148,14 +3148,16 @@ def test_gen_app_wrapper_with_oauth(mocker: MockerFixture):
         "codeflare_sdk.cluster.cluster.get_current_namespace",
         return_value="opendatahub",
     )
+    mocker.patch(
+        "codeflare_sdk.utils.generate_yaml.is_openshift_cluster", return_value=True
+    )
     write_user_appwrapper = MagicMock()
     mocker.patch(
         "codeflare_sdk.utils.generate_yaml.write_user_appwrapper", write_user_appwrapper
     )
     Cluster(
         ClusterConfiguration(
             "test_cluster",
-            openshift_oauth=True,
             image="quay.io/project-codeflare/ray:latest-py39-cu118",
             ingress_domain="apps.cluster.awsroute.org",
             write_to_file=True,