Skip to content

[main] Upgrade important CI environment #66580

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

Closed
github-actions wants to merge 1 commit into from
Closed

[main] Upgrade important CI environment #66580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Dockerfile.ci
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1671,7 +1671,7 @@ ENV DEV_APT_COMMAND=${DEV_APT_COMMAND} \

ARG AIRFLOW_PYTHON_VERSION="3.13.13"
ENV AIRFLOW_PYTHON_VERSION=${AIRFLOW_PYTHON_VERSION}
ENV GOLANG_MAJOR_MINOR_VERSION="1.26.2"
ENV GOLANG_MAJOR_MINOR_VERSION="1.26.3"
ENV RUSTUP_HOME="/usr/local/rustup"
ENV CARGO_HOME="/usr/local/cargo"
ENV PATH="${CARGO_HOME}/bin:${PATH}"
Expand Down
4 changes: 2 additions & 2 deletions dev/breeze/src/airflow_breeze/commands/kubernetes_commands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -715,8 +715,8 @@ def _upload_k8s_image(python: str, kubernetes_version: str, output: Output | Non
# turn the scheduled K8s test job red. Auto-bumped by
# scripts/ci/prek/upgrade_important_versions.py.
K8S_TEST_IMAGES_TO_PRELOAD: tuple[str, ...] = (
"alpine:3.23", # xcom_sidecar default in providers/cncf/kubernetes
"busybox:1.37", # busybox-based system tests in kubernetes-tests/
"alpine:20260127", # xcom_sidecar default in providers/cncf/kubernetes
"busybox:1.37.0", # busybox-based system tests in kubernetes-tests/
Comment thread
potiuk marked this conversation as resolved.
"ubuntu:24.04", # ubuntu-based system tests in kubernetes-tests/
)

Expand Down
190 changes: 89 additions & 101 deletions dev/breeze/uv.lock
View file
Open in desktop

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions kubernetes-tests/tests/kubernetes_tests/test_kubernetes_pod_operator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1037,7 +1037,7 @@ def test_pod_template_file(
},
{
"command": ["sh", "-c", 'trap "exit 0" INT; while true; do sleep 1; done;'],
"image": "alpine:3.23",
"image": "alpine:20260127",
"name": "airflow-xcom-sidecar",
"resources": {
"requests": {"cpu": "1m", "memory": "10Mi"},
Expand Down Expand Up @@ -1360,13 +1360,13 @@ def test_init_container_logs(self):
callback = MagicMock()
init_container = k8s.V1Container(
name="init-container",
image="busybox:1.37",
image="busybox:1.37.0",
command=["sh", "-cx"],
args=[f"echo {marker_from_init_container}"],
)
k = KubernetesPodOperator(
namespace="default",
image="busybox:1.37",
image="busybox:1.37.0",
cmds=["sh", "-cx"],
arguments=[f"echo {marker_from_main_container}"],
labels=self.labels,
Expand All @@ -1393,25 +1393,25 @@ def test_init_container_logs_filtered(self):
callback = MagicMock()
init_container_to_log_1 = k8s.V1Container(
name="init-container-to-log-1",
image="busybox:1.37",
image="busybox:1.37.0",
command=["sh", "-cx"],
args=[f"echo {marker_from_init_container_to_log_1}"],
)
init_container_to_log_2 = k8s.V1Container(
name="init-container-to-log-2",
image="busybox:1.37",
image="busybox:1.37.0",
command=["sh", "-cx"],
args=[f"echo {marker_from_init_container_to_log_2}"],
)
init_container_to_ignore = k8s.V1Container(
name="init-container-to-ignore",
image="busybox:1.37",
image="busybox:1.37.0",
command=["sh", "-cx"],
args=[f"echo {marker_from_init_container_to_ignore}"],
)
k = KubernetesPodOperator(
namespace="default",
image="busybox:1.37",
image="busybox:1.37.0",
cmds=["sh", "-cx"],
arguments=[f"echo {marker_from_main_container}"],
labels=self.labels,
Expand Down Expand Up @@ -1477,7 +1477,7 @@ def test_log_output_configurations(self, log_prefix_enabled, log_formatter, expe
marker = f"test_log_{uuid4()}"
k = KubernetesPodOperator(
namespace="default",
image="busybox:1.37",
image="busybox:1.37.0",
cmds=["sh", "-cx"],
arguments=[f"echo {marker}"],
labels={"test_label": "test"},
Expand Down Expand Up @@ -1559,7 +1559,7 @@ def test_kubernetes_pod_operator_active_deadline_seconds(self, active_deadline_s
k = KubernetesPodOperator(
task_id=f"test_task_{active_deadline_seconds}",
active_deadline_seconds=active_deadline_seconds,
image="busybox:1.37",
image="busybox:1.37.0",
cmds=["sh", "-c", echo],
namespace=ns,
on_finish_action="keep_pod",
Expand Down
2 changes: 1 addition & 1 deletion providers/cncf/kubernetes/src/airflow/providers/cncf/kubernetes/utils/xcom_sidecar.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
# does not re-pull on every task — protecting CI and disconnected
# deployments from Docker Hub anonymous-pull rate limits. Tracked by
# scripts/ci/prek/upgrade_important_versions.py.
XCOM_SIDECAR_IMAGE = "alpine:3.23"
XCOM_SIDECAR_IMAGE = "alpine:20260127"


class PodDefaults:
Expand Down
2 changes: 1 addition & 1 deletion providers/cncf/kubernetes/tests/system/cncf/kubernetes/example_kubernetes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@
# [START howto_operator_k8s_write_xcom]
write_xcom = KubernetesPodOperator(
namespace="default",
image="alpine:3.23",
image="alpine:20260127",
cmds=["sh", "-c", "mkdir -p /airflow/xcom/;echo '[1,2,3,4]' > /airflow/xcom/return.json"],
name="write-xcom",
do_xcom_push=True,
Expand Down
2 changes: 1 addition & 1 deletion providers/cncf/kubernetes/tests/system/cncf/kubernetes/example_kubernetes_async.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@
write_xcom_async = KubernetesPodOperator(
task_id="kubernetes_write_xcom_task_async",
namespace="default",
image="alpine:3.23",
image="alpine:20260127",
cmds=["sh", "-c", "mkdir -p /airflow/xcom/;echo '[1,2,3,4]' > /airflow/xcom/return.json"],
name="write-xcom",
do_xcom_push=True,
Expand Down
6 changes: 3 additions & 3 deletions providers/cncf/kubernetes/tests/unit/cncf/kubernetes/operators/test_pod.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -875,7 +875,7 @@ def test_get_or_create_pod_reattach_with_evicted(
assert result == mock_pod_request_obj

def test_xcom_sidecar_container_image_custom(self):
image = "private.repo/alpine:3.13"
image = "private.repo/alpine:20260127"
with temp_override_attr(PodDefaults.SIDECAR_CONTAINER, "image", image):
k = KubernetesPodOperator(
name="test",
Expand All @@ -892,7 +892,7 @@ def test_xcom_sidecar_container_image_default(self):
do_xcom_push=True,
)
pod = k.build_pod_request_obj(create_context(k))
assert pod.spec.containers[1].image == "alpine:3.23"
assert pod.spec.containers[1].image == "alpine:20260127"

def test_xcom_sidecar_container_resources_default(self):
k = KubernetesPodOperator(
Expand Down Expand Up @@ -2741,7 +2741,7 @@ def test_async_xcom_sidecar_container_image_default_should_execute_successfully(
deferrable=True,
)
pod = k.build_pod_request_obj(create_context(k))
assert pod.spec.containers[1].image == "alpine:3.23"
assert pod.spec.containers[1].image == "alpine:20260127"

def test_async_xcom_sidecar_container_resources_default_should_execute_successfully(self):
k = KubernetesPodOperator(
Expand Down
Loading
Loading