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

Fix edge-case when conflicting constraints prevent k8s env creation (… #43298

Merged
merged 2 commits into from
Oct 23, 2024
Merged

Fix edge-case when conflicting constraints prevent k8s env creation (… #43298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4fe3fc2
Fix edge-case when conflicting constraints prevent k8s env creation (…
potiuk Oct 23, 2024
9a4fb0a
Update k8s_requirements.txt
potiuk Oct 23, 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
38 changes: 33 additions & 5 deletions dev/breeze/src/airflow_breeze/utils/kubernetes_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,11 @@
from typing import Any, NamedTuple
from urllib import request

from airflow_breeze.branch_defaults import AIRFLOW_BRANCH
from airflow_breeze.global_constants import (
ALLOWED_ARCHITECTURES,
ALLOWED_PYTHON_MAJOR_MINOR_VERSIONS,
APACHE_AIRFLOW_GITHUB_REPOSITORY,
HELM_VERSION,
KIND_VERSION,
PIP_VERSION,
Expand Down Expand Up @@ -299,7 +301,7 @@ def _requirements_changed() -> bool:


def _install_packages_in_k8s_virtualenv():
install_command = [
install_command_no_constraints = [
str(PYTHON_BIN_PATH),
"-m",
"pip",
Expand All @@ -311,16 +313,42 @@ def _install_packages_in_k8s_virtualenv():
capture_output = True
if get_verbose():
capture_output = False
python_major_minor_version = run_command(
[
str(PYTHON_BIN_PATH),
"-c",
"import sys; print(f'{sys.version_info.major}.{sys.version_info.minor}')",
],
capture_output=True,
check=True,
text=True,
).stdout.strip()
install_command_with_constraints = install_command_no_constraints.copy()
install_command_with_constraints.extend(
[
"--constraint",
"https://raw.githubusercontent.com/"
f"{APACHE_AIRFLOW_GITHUB_REPOSITORY}/"
f"constraints-{AIRFLOW_BRANCH}/constraints-{python_major_minor_version}.txt",
],
)
install_packages_result = run_command(
install_command, check=False, capture_output=capture_output, text=True, env=env
install_command_with_constraints, check=False, capture_output=capture_output, text=True, env=env
)
if install_packages_result.returncode != 0:
get_console().print(
f"[error]Error when installing packages from : {K8S_REQUIREMENTS_PATH.resolve()}[/]\n"
)
if not get_verbose():
get_console().print(install_packages_result.stdout)
get_console().print(install_packages_result.stderr)
install_packages_result = run_command(
install_command_no_constraints, check=False, capture_output=capture_output, text=True, env=env
)
if install_packages_result.returncode != 0:
get_console().print(
f"[error]Error when installing packages from : {K8S_REQUIREMENTS_PATH.resolve()}[/]\n"
)
if not get_verbose():
get_console().print(install_packages_result.stdout)
get_console().print(install_packages_result.stderr)
return install_packages_result


Expand Down
2 changes: 1 addition & 1 deletion scripts/ci/kubernetes/k8s_requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-e .[devel-devscripts,devel-tests,cncf.kubernetes] --constraint "https://raw.githubusercontent.com/apache/airflow/constraints-main/constraints-3.8.txt"
-e .[devel-devscripts,devel-tests,cncf.kubernetes]
Loading