Skip to content

Commit d5559f9

Browse files
ChristianZaccariaChristianZaccaria
committed
Cleanup commented code
1 parent 0cddf34 commit d5559f9

File tree

7 files changed

+10
-430
lines changed

7 files changed

+10
-430
lines changed

‎src/codeflare_sdk/cluster/cluster.py

Lines changed: 0 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,6 @@ def create_app_wrapper(self):
188188
image_pull_secrets = self.config.image_pull_secrets
189189
dispatch_priority = self.config.dispatch_priority
190190
ingress_domain = self.config.ingress_domain
191-
# ingress_options = self.config.ingress_options
192191
write_to_file = self.config.write_to_file
193192
verify_tls = self.config.verify_tls
194193
return generate_appwrapper(
@@ -214,7 +213,6 @@ def create_app_wrapper(self):
214213
dispatch_priority=dispatch_priority,
215214
priority_val=priority_val,
216215
ingress_domain=ingress_domain,
217-
# ingress_options=ingress_options,
218216
write_to_file=write_to_file,
219217
verify_tls=verify_tls,
220218
)
@@ -553,7 +551,6 @@ def from_k8_cluster_object(
553551
local_interactive=local_interactive,
554552
mcad=mcad,
555553
ingress_domain=ingress_domain,
556-
# ingress_options=ingress_options,
557554
write_to_file=write_to_file,
558555
verify_tls=verify_tls,
559556
)
@@ -661,7 +658,6 @@ def get_cluster(
661658
if rc["metadata"]["name"] == cluster_name:
662659
mcad = _check_aw_exists(cluster_name, namespace)
663660
ingress_host = None
664-
# ingress_options = {}
665661
if not is_openshift_cluster():
666662
try:
667663
config_check()
@@ -674,36 +670,6 @@ def get_cluster(
674670
and ingress.metadata.labels["ingress-owner"] == cluster_name
675671
):
676672
ingress_host = ingress.spec.rules[0].host
677-
# if (
678-
# "ingress-options" in ingress.metadata.labels
679-
# and ingress.metadata.labels["ingress-options"] == "true"
680-
# ):
681-
# ingress_name = ingress.metadata.name
682-
# port = (
683-
# ingress.spec.rules[0]
684-
# .http.paths[0]
685-
# .backend.service.port.number
686-
# )
687-
# annotations = ingress.metadata.annotations
688-
# path = ingress.spec.rules[0].http.paths[0].path
689-
# ingress_class_name = ingress.spec.ingress_class_name
690-
# path_type = (
691-
# ingress.spec.rules[0].http.paths[0].path_type
692-
# )
693-
694-
# ingress_options = {
695-
# "ingresses": [
696-
# {
697-
# "ingressName": ingress_name,
698-
# "port": port,
699-
# "annotations": annotations,
700-
# "ingressClassName": ingress_class_name,
701-
# "pathType": path_type,
702-
# "path": path,
703-
# "host": ingress_host,
704-
# }
705-
# ]
706-
# }
707673
except Exception as e: # pragma: no cover
708674
return _kube_api_error_handling(e)
709675
# We gather the ingress domain from the host
@@ -715,7 +681,6 @@ def get_cluster(
715681
rc,
716682
mcad=mcad,
717683
ingress_domain=ingress_domain,
718-
# ingress_options=ingress_options,
719684
write_to_file=write_to_file,
720685
verify_tls=verify_tls,
721686
)
@@ -738,24 +703,6 @@ def _delete_resources(
738703
plural="rayclusters",
739704
name=name,
740705
)
741-
# elif resource["kind"] == "Ingress":
742-
# name = resource["metadata"]["name"]
743-
# api_instance.delete_namespaced_custom_object(
744-
# group="networking.k8s.io",
745-
# version="v1",
746-
# namespace=namespace,
747-
# plural="ingresses",
748-
# name=name,
749-
# )
750-
# elif resource["kind"] == "Route":
751-
# name = resource["metadata"]["name"]
752-
# api_instance.delete_namespaced_custom_object(
753-
# group="route.openshift.io",
754-
# version="v1",
755-
# namespace=namespace,
756-
# plural="routes",
757-
# name=name,
758-
# )
759706
elif resource["kind"] == "Secret":
760707
name = resource["metadata"]["name"]
761708
secret_instance = client.CoreV1Api(api_config_handler())
@@ -775,22 +722,6 @@ def _create_resources(yamls, namespace: str, api_instance: client.CustomObjectsA
775722
plural="rayclusters",
776723
body=resource,
777724
)
778-
# elif resource["kind"] == "Ingress":
779-
# api_instance.create_namespaced_custom_object(
780-
# group="networking.k8s.io",
781-
# version="v1",
782-
# namespace=namespace,
783-
# plural="ingresses",
784-
# body=resource,
785-
# )
786-
# elif resource["kind"] == "Route":
787-
# api_instance.create_namespaced_custom_object(
788-
# group="route.openshift.io",
789-
# version="v1",
790-
# namespace=namespace,
791-
# plural="routes",
792-
# body=resource,
793-
# )
794725
elif resource["kind"] == "Secret":
795726
secret_instance = client.CoreV1Api(api_config_handler())
796727
secret_instance.create_namespaced_secret(

‎src/codeflare_sdk/cluster/config.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ class ClusterConfiguration:
5252
local_interactive: bool = False
5353
image_pull_secrets: list = field(default_factory=list)
5454
dispatch_priority: str = None
55-
# ingress_options: dict = field(default_factory=dict)
5655
ingress_domain: str = None
5756
write_to_file: bool = False
5857
verify_tls: bool = True

‎src/codeflare_sdk/templates/base-template.yaml

Lines changed: 0 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -338,91 +338,6 @@ spec:
338338
- key: odh-ca-bundle.crt
339339
path: odh-ca-bundle.crt
340340
optional: true
341-
# - replicas: 1
342-
# generictemplate:
343-
# apiVersion: networking.k8s.io/v1
344-
# kind: Ingress
345-
# metadata:
346-
# name: ray-dashboard-deployment-ingress
347-
# namespace: default
348-
# annotations:
349-
# annotations-example:annotations-example
350-
# labels:
351-
# ingress-options: "false"
352-
# ingress-owner: appwrapper-name
353-
# spec:
354-
# ingressClassName: nginx
355-
# rules:
356-
# - http:
357-
# paths:
358-
# - backend:
359-
# service:
360-
# name: raytest-head-svc
361-
# port:
362-
# number: 8265
363-
# pathType: Prefix
364-
# path: /
365-
# host: ray-dashboard-raytest.<ingress-domain>
366-
# - replicas: 1
367-
# generictemplate:
368-
# kind: Route
369-
# apiVersion: route.openshift.io/v1
370-
# metadata:
371-
# name: ray-dashboard-deployment-route
372-
# namespace: default
373-
# labels:
374-
# # allows me to return name of service that Ray operator creates
375-
# odh-ray-cluster-service: deployment-name-head-svc
376-
# spec:
377-
# to:
378-
# kind: Service
379-
# name: deployment-name-head-svc
380-
# port:
381-
# targetPort: dashboard
382-
# tls:
383-
# termination: edge
384-
# - replicas: 1
385-
# generictemplate:
386-
# apiVersion: networking.k8s.io/v1
387-
# kind: Ingress
388-
# metadata:
389-
# name: rayclient-deployment-ingress
390-
# namespace: default
391-
# annotations:
392-
# annotations-example:annotations-example
393-
# labels:
394-
# odh-ray-cluster-service: deployment-name-head-svc
395-
# spec:
396-
# ingressClassName: nginx
397-
# rules:
398-
# - http:
399-
# paths:
400-
# - backend:
401-
# service:
402-
# name: deployment-name-head-svc
403-
# port:
404-
# number: 10001
405-
# path: ''
406-
# pathType: ImplementationSpecific
407-
# host: rayclient-raytest.<ingress-domain>
408-
# - replicas: 1
409-
# generictemplate:
410-
# apiVersion: route.openshift.io/v1
411-
# kind: Route
412-
# metadata:
413-
# name: rayclient-deployment-route
414-
# namespace: default
415-
# labels:
416-
# # allows me to return name of service that Ray operator creates
417-
# odh-ray-cluster-service: deployment-name-head-svc
418-
# spec:
419-
# port:
420-
# targetPort: client
421-
# tls:
422-
# termination: passthrough
423-
# to:
424-
# kind: Service
425-
# name: deployment-name-head-svc
426341
- replicas: 1
427342
generictemplate:
428343
apiVersion: v1

0 commit comments

Comments
 (0)