change: use current namespace when not specified

Author: carsonmh

carson.yaml

@@ -0,0 +1,173 @@
+apiVersion: mcad.ibm.com/v1beta1
+kind: AppWrapper
+metadata:
+  name: carson
+  namespace: default
+spec:
+  priority: 9
+  resources:
+    GenericItems:
+    - custompodresources:
+      - limits:
+          cpu: 2
+          memory: 8G
+          nvidia.com/gpu: 0
+        replicas: 1
+        requests:
+          cpu: 2
+          memory: 8G
+          nvidia.com/gpu: 0
+      - limits:
+          cpu: 1
+          memory: 2G
+          nvidia.com/gpu: 0
+        replicas: 1
+        requests:
+          cpu: 1
+          memory: 2G
+          nvidia.com/gpu: 0
+      generictemplate:
+        apiVersion: ray.io/v1alpha1
+        kind: RayCluster
+        metadata:
+          labels:
+            appwrapper.mcad.ibm.com: carson
+            controller-tools.k8s.io: '1.0'
+          name: carson
+          namespace: default
+        spec:
+          autoscalerOptions:
+            idleTimeoutSeconds: 60
+            imagePullPolicy: Always
+            resources:
+              limits:
+                cpu: 500m
+                memory: 512Mi
+              requests:
+                cpu: 500m
+                memory: 512Mi
+            upscalingMode: Default
+          enableInTreeAutoscaling: false
+          headGroupSpec:
+            rayStartParams:
+              block: 'true'
+              dashboard-host: 0.0.0.0
+              num-gpus: '0'
+            serviceType: ClusterIP
+            template:
+              spec:
+                containers:
+                - env:
+                  - name: MY_POD_IP
+                    valueFrom:
+                      fieldRef:
+                        fieldPath: status.podIP
+                  - name: RAY_USE_TLS
+                    value: '0'
+                  - name: RAY_TLS_SERVER_CERT
+                    value: /home/ray/workspace/tls/server.crt
+                  - name: RAY_TLS_SERVER_KEY
+                    value: /home/ray/workspace/tls/server.key
+                  - name: RAY_TLS_CA_CERT
+                    value: /home/ray/workspace/tls/ca.crt
+                  image: quay.io/project-codeflare/ray:2.5.0-py38-cu116
+                  imagePullPolicy: Always
+                  lifecycle:
+                    preStop:
+                      exec:
+                        command:
+                        - /bin/sh
+                        - -c
+                        - ray stop
+                  name: ray-head
+                  ports:
+                  - containerPort: 6379
+                    name: gcs
+                  - containerPort: 8265
+                    name: dashboard
+                  - containerPort: 10001
+                    name: client
+                  resources:
+                    limits:
+                      cpu: 2
+                      memory: 8G
+                      nvidia.com/gpu: 0
+                    requests:
+                      cpu: 2
+                      memory: 8G
+                      nvidia.com/gpu: 0
+                imagePullSecrets: []
+          rayVersion: 2.1.0
+          workerGroupSpecs:
+          - groupName: small-group-carson
+            maxReplicas: 1
+            minReplicas: 1
+            rayStartParams:
+              block: 'true'
+              num-gpus: '0'
+            replicas: 1
+            template:
+              metadata:
+                annotations:
+                  key: value
+                labels:
+                  key: value
+              spec:
+                containers:
+                - env:
+                  - name: MY_POD_IP
+                    valueFrom:
+                      fieldRef:
+                        fieldPath: status.podIP
+                  - name: RAY_USE_TLS
+                    value: '0'
+                  - name: RAY_TLS_SERVER_CERT
+                    value: /home/ray/workspace/tls/server.crt
+                  - name: RAY_TLS_SERVER_KEY
+                    value: /home/ray/workspace/tls/server.key
+                  - name: RAY_TLS_CA_CERT
+                    value: /home/ray/workspace/tls/ca.crt
+                  image: quay.io/project-codeflare/ray:2.5.0-py38-cu116
+                  lifecycle:
+                    preStop:
+                      exec:
+                        command:
+                        - /bin/sh
+                        - -c
+                        - ray stop
+                  name: machine-learning
+                  resources:
+                    limits:
+                      cpu: 1
+                      memory: 2G
+                      nvidia.com/gpu: 0
+                    requests:
+                      cpu: 1
+                      memory: 2G
+                      nvidia.com/gpu: 0
+                imagePullSecrets: []
+                initContainers:
+                - command:
+                  - sh
+                  - -c
+                  - until nslookup $RAY_IP.$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace).svc.cluster.local;
+                    do echo waiting for myservice; sleep 2; done
+                  image: busybox:1.28
+                  name: init-myservice
+      replicas: 1
+    - generictemplate:
+        apiVersion: route.openshift.io/v1
+        kind: Route
+        metadata:
+          labels:
+            odh-ray-cluster-service: carson-head-svc
+          name: ray-dashboard-carson
+          namespace: default
+        spec:
+          port:
+            targetPort: dashboard
+          to:
+            kind: Service
+            name: carson-head-svc
+      replica: 1
+    Items: []

src/codeflare_sdk/cli/codeflare_cli.py

@@ -2,13 +2,15 @@
 import os
 
 from codeflare_sdk.cli.cli_utils import load_auth
+from codeflare_sdk.cluster.cluster import get_current_namespace
 
 cmd_folder = os.path.abspath(os.path.join(os.path.dirname(__file__), "commands"))
 
 
 class CodeflareContext:
     def __init__(self):
         self.codeflare_path = _initialize_codeflare_folder()
+        self.current_namespace = get_current_namespace()
 
 
 def _initialize_codeflare_folder():

src/codeflare_sdk/cli/commands/define.py

@@ -12,8 +12,9 @@ def cli():
 
 
 @cli.command()
+@click.pass_context
 @click.option("--name", type=str, required=True)
-@click.option("--namespace", "-n", type=str, required=True)
+@click.option("--namespace", "-n", type=str)
 @click.option("--head_info", cls=PythonLiteralOption, type=list)
 @click.option("--machine_types", cls=PythonLiteralOption, type=list)
 @click.option("--min_cpus", type=int)
@@ -29,8 +30,10 @@ def cli():
 @click.option("--image", type=str)
 @click.option("--local_interactive", type=bool)
 @click.option("--image_pull_secrets", cls=PythonLiteralOption, type=list)
-def raycluster(**kwargs):
+def raycluster(ctx, **kwargs):
     """Define a RayCluster with parameter specifications"""
     filtered_kwargs = {k: v for k, v in kwargs.items() if v is not None}
+    if "namespace" not in filtered_kwargs.keys():
+        filtered_kwargs["namespace"] = ctx.obj.current_namespace
     clusterConfig = ClusterConfiguration(**filtered_kwargs)
     Cluster(clusterConfig)  # Creates yaml file

src/codeflare_sdk/cli/commands/delete.py

@@ -12,12 +12,14 @@ def cli():
 
 
 @cli.command()
+@click.pass_context
 @click.argument("name", type=str)
-@click.option("--namespace", type=str, required=True)
-def raycluster(name, namespace):
+@click.option("--namespace", type=str)
+def raycluster(ctx, name, namespace):
     """
     Delete a specified RayCluster from the Kubernetes cluster
     """
+    namespace = namespace or ctx.obj.current_namespace
     try:
         cluster = get_cluster(name, namespace)
     except FileNotFoundError:

src/codeflare_sdk/cli/commands/details.py

@@ -11,10 +11,11 @@ def cli():
 
 @cli.command()
 @click.argument("name", type=str)
-@click.option("--namespace", type=str, required=True)
+@click.option("--namespace", type=str)
 @click.pass_context
 def raycluster(ctx, name, namespace):
     """Get the details of a specified RayCluster"""
+    namespace = namespace or ctx.obj.current_namespace
     try:
         cluster = get_cluster(name, namespace)
     except FileNotFoundError:

src/codeflare_sdk/cli/commands/list.py

@@ -23,9 +23,7 @@ def raycluster(ctx, namespace, all):
     if all and namespace:
         click.echo("--all and --namespace are mutually exclusive")
         return
-    if not all and not namespace:
-        click.echo("You must specify either --namespace or --all")
-        return
+    namespace = namespace or ctx.obj.current_namespace
     if not all:
         list_all_clusters(namespace)
         return

src/codeflare_sdk/cli/commands/status.py

@@ -11,10 +11,11 @@ def cli():
 
 @cli.command()
 @click.argument("name", type=str)
-@click.option("--namespace", type=str, required=True)
+@click.option("--namespace", type=str)
 @click.pass_context
 def raycluster(ctx, name, namespace):
     """Get the status of a specified RayCluster"""
+    namespace = namespace or ctx.obj.current_namespace
     try:
         cluster = get_cluster(name, namespace)
     except FileNotFoundError: