Skip to content

Commit 434c971

Browse files
Remove openshift_oauth configuration
1 parent c3fedc3 commit 434c971

File tree

7 files changed

+3
-9
lines changed

7 files changed

+3
-9
lines changed

src/codeflare_sdk/cluster/cluster.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ def job_client(self):
9797
self._job_submission_client = JobSubmissionClient(
9898
self.cluster_dashboard_uri(),
9999
headers=self._client_headers,
100-
verify=self._client_verify_tls,
100+
verify=False,
101101
)
102102
else:
103103
self._job_submission_client = JobSubmissionClient(
@@ -354,7 +354,7 @@ def is_dashboard_ready(self) -> bool:
354354
self.cluster_dashboard_uri(),
355355
headers=self._client_headers,
356356
timeout=5,
357-
verify=self._client_verify_tls,
357+
verify=False,
358358
)
359359
except requests.exceptions.SSLError: # pragma no cover
360360
# SSL exception occurs when oauth ingress has been created but cluster is not up

src/codeflare_sdk/templates/base-template.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ spec:
4242
metadata:
4343
annotations:
4444
sdk.codeflare.dev/local_interactive: "False"
45-
codeflare.dev/oauth: 'False'
4645
labels:
4746
workload.codeflare.dev/appwrapper: "aw-kuberay"
4847
controller-tools.k8s.io: "1.0"

src/codeflare_sdk/utils/generate_yaml.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,13 +219,12 @@ def update_rayclient_ingress(
219219
spec["rules"][0]["host"] = f"rayclient-{cluster_name}-{namespace}.{ingress_domain}"
220220

221221

222-
def update_names(yaml, item, appwrapper_name, cluster_name, namespace, openshift_oauth):
222+
def update_names(yaml, item, appwrapper_name, cluster_name, namespace):
223223
metadata = yaml.get("metadata")
224224
metadata["name"] = appwrapper_name
225225
metadata["namespace"] = namespace
226226
lower_meta = item.get("generictemplate", {}).get("metadata")
227227
lower_meta["labels"]["workload.codeflare.dev/appwrapper"] = appwrapper_name
228-
lower_meta["annotations"]["codeflare.dev/oauth"] = f"{openshift_oauth}"
229228
lower_meta["name"] = cluster_name
230229
lower_meta["namespace"] = namespace
231230
lower_spec = item.get("generictemplate", {}).get("spec")

tests/test-case-no-mcad.yamls

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ apiVersion: ray.io/v1
33
kind: RayCluster
44
metadata:
55
annotations:
6-
codeflare.dev/oauth: 'False'
76
sdk.codeflare.dev/ingress_domain: apps.cluster.awsroute.org
87
sdk.codeflare.dev/local_interactive: 'False'
98
labels:

tests/test-case-prio.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ spec:
3333
kind: RayCluster
3434
metadata:
3535
annotations:
36-
codeflare.dev/oauth: 'False'
3736
sdk.codeflare.dev/ingress_domain: apps.cluster.awsroute.org
3837
sdk.codeflare.dev/local_interactive: 'False'
3938
labels:

tests/test-case.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ spec:
3232
kind: RayCluster
3333
metadata:
3434
annotations:
35-
codeflare.dev/oauth: 'False'
3635
sdk.codeflare.dev/ingress_domain: apps.cluster.awsroute.org
3736
sdk.codeflare.dev/local_interactive: 'False'
3837
labels:

tests/test-default-appwrapper.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ spec:
3232
annotations:
3333
sdk.codeflare.dev/ingress_domain: apps.cluster.awsroute.org
3434
sdk.codeflare.dev/local_interactive: 'False'
35-
codeflare.dev/oauth: 'False'
3635
labels:
3736
controller-tools.k8s.io: '1.0'
3837
workload.codeflare.dev/appwrapper: unit-test-default-cluster

0 commit comments

Comments
 (0)