make ssh services optional

skypilot-org · Apr 17, 2024 · 87d4d25 · 87d4d25
1 parent 750d4d4
commit 87d4d25
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 0 deletions.
diff --git a/sky/clouds/kubernetes.py b/sky/clouds/kubernetes.py
@@ -262,6 +262,7 @@ def make_deploy_resources_variables(
                 kubernetes_utils.get_gpu_label_key_value(acc_type)
 
         port_mode = network_utils.get_port_mode(None)
+        networking_mode = network_utils.get_networking_mode(None)
 
         remote_identity = skypilot_config.get_nested(
             ('kubernetes', 'remote_identity'), schemas.REMOTE_IDENTITY_DEFAULT)
@@ -289,6 +290,7 @@ def make_deploy_resources_variables(
             'k8s_namespace':
                 kubernetes_utils.get_current_kube_config_context_namespace(),
             'k8s_port_mode': port_mode.value,
+            'k8s_networking_mode': networking_mode.value,
             'k8s_ssh_key_secret_name': self.SKY_SSH_KEY_SECRET_NAME,
             'k8s_acc_label_key': k8s_acc_label_key,
             'k8s_acc_label_value': k8s_acc_label_value,

diff --git a/sky/provision/kubernetes/network_utils.py b/sky/provision/kubernetes/network_utils.py
@@ -43,6 +43,23 @@ def get_port_mode(
     return port_mode
 
 
+def get_networking_mode(mode_str: Optional[str] = None) -> kubernetes_enums.KubernetesNetworkingMode:
+    """Get the networking mode from the provider config."""
+    mode_str = mode_str or skypilot_config.get_nested(
+        ('kubernetes', 'networking_mode'),
+        kubernetes_enums.KubernetesNetworkingMode.PORTFORWARD.value)
+    try:
+        networking_mode = kubernetes_enums.KubernetesNetworkingMode(mode_str)
+    except ValueError as e:
+        with ux_utils.print_exception_no_traceback():
+            raise ValueError(str(e)
+                + ' Cluster was setup with invalid networking mode.'
+                + 'Please check the networking_mode in provider config.') \
+                from None
+
+    return networking_mode
+
+
 def fill_loadbalancer_template(namespace: str, service_name: str,
                                ports: List[int], selector_key: str,
                                selector_value: str) -> Dict:

diff --git a/sky/templates/kubernetes-ray.yml.j2 b/sky/templates/kubernetes-ray.yml.j2
@@ -155,8 +155,11 @@ provider:
             name: skypilot-service-account-cluster-role
             apiGroup: rbac.authorization.k8s.io
 
+    {% if k8s_networking_mode == "nodeport" or num_nodes > 1 %}
     services:
+      {% if k8s_networking_mode == "nodeport" %}
       # Service to expose the head node pod's SSH port.
+      # Required only when using nodeport for accessing ssh.
       - apiVersion: v1
         kind: Service
         metadata:
@@ -171,7 +174,10 @@ provider:
             - protocol: TCP
               port: 22
               targetPort: 22
+      {% endif %}
+      {% if num_nodes > 1 %}
       # Service that maps to the head node of the Ray cluster.
+      # Required only in multi-node settings.
       - apiVersion: v1
         kind: Service
         metadata:
@@ -195,6 +201,8 @@ provider:
                   protocol: TCP
                   port: 8265
                   targetPort: 8265
+      {% endif %}
+    {% endif %}
 
 # Specify the pod type for the ray head node (as configured below).
 head_node_type: ray_head_default