Use scarf images (#1434)

* Use scarf images Signed-off-by: Eduardo Apolinario <[email protected]> * Use scarf names in tests. Signed-off-by: Eduardo Apolinario <[email protected]> --------- Signed-off-by: Eduardo Apolinario <[email protected]> Co-authored-by: Eduardo Apolinario <[email protected]>
flyteorg · Feb 22, 2023 · 0baa756 · 0baa756
1 parent 56a7fcd
commit 0baa756
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/flytekit/configuration/default_images.py b/flytekit/configuration/default_images.py
@@ -16,10 +16,10 @@ class DefaultImages(object):
     """
 
     _DEFAULT_IMAGE_PREFIXES = {
-        PythonVersion.PYTHON_3_7: "ghcr.io/flyteorg/flytekit:py3.7-",
-        PythonVersion.PYTHON_3_8: "ghcr.io/flyteorg/flytekit:py3.8-",
-        PythonVersion.PYTHON_3_9: "ghcr.io/flyteorg/flytekit:py3.9-",
-        PythonVersion.PYTHON_3_10: "ghcr.io/flyteorg/flytekit:py3.10-",
+        PythonVersion.PYTHON_3_7: "cr.flyte.org/flyteorg/flytekit:py3.7-",
+        PythonVersion.PYTHON_3_8: "cr.flyte.org/flyteorg/flytekit:py3.8-",
+        PythonVersion.PYTHON_3_9: "cr.flyte.org/flyteorg/flytekit:py3.9-",
+        PythonVersion.PYTHON_3_10: "cr.flyte.org/flyteorg/flytekit:py3.10-",
     }
 
     @classmethod

diff --git a/tests/flytekit/unit/configuration/test_image_config.py b/tests/flytekit/unit/configuration/test_image_config.py
@@ -11,10 +11,10 @@
 @pytest.mark.parametrize(
     "python_version_enum, expected_image_string",
     [
-        (PythonVersion.PYTHON_3_7, "ghcr.io/flyteorg/flytekit:py3.7-latest"),
-        (PythonVersion.PYTHON_3_8, "ghcr.io/flyteorg/flytekit:py3.8-latest"),
-        (PythonVersion.PYTHON_3_9, "ghcr.io/flyteorg/flytekit:py3.9-latest"),
-        (PythonVersion.PYTHON_3_10, "ghcr.io/flyteorg/flytekit:py3.10-latest"),
+        (PythonVersion.PYTHON_3_7, "cr.flyte.org/flyteorg/flytekit:py3.7-latest"),
+        (PythonVersion.PYTHON_3_8, "cr.flyte.org/flyteorg/flytekit:py3.8-latest"),
+        (PythonVersion.PYTHON_3_9, "cr.flyte.org/flyteorg/flytekit:py3.9-latest"),
+        (PythonVersion.PYTHON_3_10, "cr.flyte.org/flyteorg/flytekit:py3.10-latest"),
     ],
 )
 def test_defaults(python_version_enum, expected_image_string):
@@ -24,8 +24,8 @@ def test_defaults(python_version_enum, expected_image_string):
 @pytest.mark.parametrize(
     "python_version_enum, flytekit_version, expected_image_string",
     [
-        (PythonVersion.PYTHON_3_7, "v0.32.0", "ghcr.io/flyteorg/flytekit:py3.7-0.32.0"),
-        (PythonVersion.PYTHON_3_8, "1.31.3", "ghcr.io/flyteorg/flytekit:py3.8-1.31.3"),
+        (PythonVersion.PYTHON_3_7, "v0.32.0", "cr.flyte.org/flyteorg/flytekit:py3.7-0.32.0"),
+        (PythonVersion.PYTHON_3_8, "1.31.3", "cr.flyte.org/flyteorg/flytekit:py3.8-1.31.3"),
     ],
 )
 def test_set_both(python_version_enum, flytekit_version, expected_image_string):
@@ -36,7 +36,7 @@ def test_image_config_auto():
     x = ImageConfig.auto_default_image()
     assert x.images[0].name == "default"
     version_str = f"{sys.version_info.major}.{sys.version_info.minor}"
-    assert x.images[0].full == f"ghcr.io/flyteorg/flytekit:py{version_str}-latest"
+    assert x.images[0].full == f"cr.flyte.org/flyteorg/flytekit:py{version_str}-latest"
 
 
 def test_image_from_flytectl_config():
@@ -56,7 +56,7 @@ def test_not_version(mock_sys):
 
 def test_image_create():
     with pytest.raises(ValueError):
-        ImageConfig.create_from("ghcr.io/im/g:latest")
+        ImageConfig.create_from("cr.flyte.org/im/g:latest")
 
-    ic = ImageConfig.from_images("ghcr.io/im/g:latest")
-    assert ic.default_image.fqn == "ghcr.io/im/g"
+    ic = ImageConfig.from_images("cr.flyte.org/im/g:latest")
+    assert ic.default_image.fqn == "cr.flyte.org/im/g"