Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

FLYTE_INTERNAL_IMAGE should have higher precedence #2523

Merged
merged 6 commits into from
Jun 20, 2024
Merged

FLYTE_INTERNAL_IMAGE should have higher precedence #2523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
739d379
FLYTE_INTERNAL_IMAGE should have higher precedence
pingsutw Jun 20, 2024
de657cc
add a test
pingsutw Jun 20, 2024
40d19d5
nit
pingsutw Jun 20, 2024
48fc588
Update flytekit/core/constants.py
pingsutw Jun 20, 2024
b5f7623
Update flytekit/core/constants.py
pingsutw Jun 20, 2024
67a999c
fix tests
pingsutw Jun 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions flytekit/configuration/default_images.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
import typing
from contextlib import suppress

from flytekit.core.constants import FLYTE_INTERNAL_IMAGE_ENV_VAR


class PythonVersion(enum.Enum):
PYTHON_3_8 = (3, 8)
Expand Down Expand Up @@ -35,13 +37,16 @@ def default_image(cls) -> str:
if default_image is not None:
return default_image

default_image_str = os.environ.get("FLYTE_INTERNAL_IMAGE", cls.find_image_for())
return default_image_str
return cls.find_image_for()

@classmethod
def find_image_for(
cls, python_version: typing.Optional[PythonVersion] = None, flytekit_version: typing.Optional[str] = None
) -> str:
default_image_str = os.getenv(FLYTE_INTERNAL_IMAGE_ENV_VAR)
if default_image_str:
return default_image_str

if python_version is None:
python_version = PythonVersion((sys.version_info.major, sys.version_info.minor))

Expand Down
3 changes: 3 additions & 0 deletions flytekit/core/constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,6 @@

START_NODE_ID = "start-node"
END_NODE_ID = "end-node"

# If set this environment variable overrides the default container image and the default base image in ImageSpec.
FLYTE_INTERNAL_IMAGE_ENV_VAR = "FLYTE_INTERNAL_IMAGE"
6 changes: 5 additions & 1 deletion tests/flytekit/unit/configuration/test_image_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import flytekit
from flytekit.configuration import ImageConfig
from flytekit.configuration.default_images import DefaultImages, PythonVersion
from flytekit.core.constants import FLYTE_INTERNAL_IMAGE_ENV_VAR


@pytest.mark.parametrize(
Expand All @@ -33,12 +34,15 @@ def test_set_both(python_version_enum, flytekit_version, expected_image_string):
assert DefaultImages.find_image_for(python_version_enum, flytekit_version) == expected_image_string


def test_image_config_auto():
def test_image_config_auto(monkeypatch):
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"cr.flyte.org/flyteorg/flytekit:py{version_str}-latest"

monkeypatch.setenv(FLYTE_INTERNAL_IMAGE_ENV_VAR, "test")
assert DefaultImages.find_image_for() == "test"


def test_image_from_flytectl_config():
image_config = ImageConfig.auto(
Expand Down
Loading