comments

sky/clouds/kubernetes.py

@@ -203,12 +203,12 @@ def make_deploy_resources_variables(
         # Select image based on whether we are using GPUs or not.
         image_id = self.IMAGE_GPU if acc_count > 0 else self.IMAGE_CPU
         # Get the container image ID from the service catalog.
-        # Note that currently we do not support custom images, so this condition
-        # will always be triggered. In the future we may want to get image_id
-        # from the resources object if it is set.
-        if image_id.startswith('skypilot:'):
-            image_id = service_catalog.get_image_id_from_tag(
-                image_id, clouds='kubernetes')
+        # TODO(romilb): Note that currently we do not support custom images,
+        #  so the image_id should start with 'skypilot:'.
+        #  In the future we may want to get image_id from the resources object.
+        assert image_id.startswith('skypilot:')
+        image_id = service_catalog.get_image_id_from_tag(
+            image_id, clouds='kubernetes')
 
         k8s_acc_label_key = None
         k8s_acc_label_value = None

sky/clouds/service_catalog/constants.py

@@ -1,6 +1,6 @@
 """Constants used for service catalog."""
 import os
 
-HOSTED_CATALOG_DIR_URL = 'https://raw.githubusercontent.com/romilbhardwaj/skypilot-catalog/k8s_images/catalogs'  # TODO - REVERT AFTER CATALOG PR IS MERGED. pylint: disable=line-too-long
+HOSTED_CATALOG_DIR_URL = 'https://raw.githubusercontent.com/skypilot-org/skypilot-catalog/master/catalogs'  # pylint: disable=line-too-long
 CATALOG_SCHEMA_VERSION = 'v5'
 LOCAL_CATALOG_DIR = os.path.expanduser('~/.sky/catalogs/')

sky/clouds/service_catalog/kubernetes_catalog.py

@@ -6,11 +6,8 @@
 
 from typing import Optional
 
-from sky import sky_logging
 from sky.clouds.service_catalog import common
 
-logger = sky_logging.init_logger(__name__)
-
 _PULL_FREQUENCY_HOURS = 7
 
 # We keep pull_frequency_hours so we can remotely update the default image paths