-
Notifications
You must be signed in to change notification settings - Fork 13.9k
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.
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 condition for k8 container completion check #27502
Closed
Closed
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -20,10 +20,9 @@ | |
import logging | ||
import os | ||
import random | ||
import re | ||
import shutil | ||
import sys | ||
import textwrap | ||
import unittest | ||
from copy import copy | ||
from tempfile import NamedTemporaryFile | ||
from unittest import mock | ||
|
@@ -77,19 +76,26 @@ def get_kubeconfig_path(): | |
return kubeconfig_path if kubeconfig_path else os.path.expanduser("~/.kube/config") | ||
|
||
|
||
def get_normalized_test_name(): | ||
test = os.environ["PYTEST_CURRENT_TEST"] | ||
test = test.replace("(setup)", "").replace("call", "") | ||
return "".join(filter(str.isalnum, test)).lower() | ||
|
||
|
||
def get_label(): | ||
test = os.environ.get("PYTEST_CURRENT_TEST") | ||
label = "".join(filter(str.isalnum, test)).lower() | ||
label = get_normalized_test_name() | ||
label = label.strip() | ||
return label[-63] | ||
|
||
|
||
@pytest.mark.execution_timeout(180) | ||
class TestKubernetesPodOperatorSystem(unittest.TestCase): | ||
class TestKubernetesPodOperatorSystem: | ||
def get_current_task_name(self): | ||
test_name = get_normalized_test_name() | ||
# reverse test name to make pod name unique (it has limited length) | ||
return "_" + unittest.TestCase.id(self).replace(".", "_")[::-1] | ||
return "_" + test_name[::-1] | ||
|
||
def setUp(self): | ||
def setup_method(self, method): | ||
self.maxDiff = None | ||
self.api_client = ApiClient() | ||
self.labels = {"test_label": get_label()} | ||
|
@@ -810,7 +816,11 @@ def test_pod_template_file_with_full_pod_spec(self): | |
assert k.pod.spec.containers[0].env == [k8s.V1EnvVar(name="env_name", value="value")] | ||
assert result == {"hello": "world"} | ||
|
||
def test_full_pod_spec(self): | ||
@pytest.mark.parametrize( | ||
"should_get_logs", | ||
[True, False], | ||
) | ||
def test_full_pod_spec(self, should_get_logs: bool): | ||
pod_spec = k8s.V1Pod( | ||
metadata=k8s.V1ObjectMeta( | ||
labels={"test_label": get_label(), "fizz": "buzz"}, namespace="default", name="test-pod" | ||
|
@@ -836,11 +846,13 @@ def test_full_pod_spec(self): | |
do_xcom_push=True, | ||
is_delete_operator_pod=False, | ||
startup_timeout_seconds=30, | ||
get_logs=should_get_logs, | ||
) | ||
|
||
context = create_context(k) | ||
result = k.execute(context) | ||
assert result is not None | ||
assert k.pod is not None | ||
assert k.pod.metadata.labels == { | ||
"fizz": "buzz", | ||
"test_label": get_label(), | ||
|
@@ -916,7 +928,12 @@ def test_init_container(self): | |
@mock.patch(f"{POD_MANAGER_CLASS}.create_pod", new=MagicMock) | ||
@mock.patch(HOOK_CLASS) | ||
def test_pod_template_file( | ||
self, hook_mock, await_pod_completion_mock, extract_xcom_mock, await_xcom_sidecar_container_start_mock | ||
self, | ||
hook_mock, | ||
await_pod_completion_mock, | ||
extract_xcom_mock, | ||
await_xcom_sidecar_container_start_mock, | ||
caplog, | ||
): | ||
# todo: This isn't really a system test | ||
await_xcom_sidecar_container_start_mock.return_value = None | ||
|
@@ -934,21 +951,19 @@ def test_pod_template_file( | |
pod_mock.status.phase = "Succeeded" | ||
await_pod_completion_mock.return_value = pod_mock | ||
context = create_context(k) | ||
with self.assertLogs(k.log, level=logging.DEBUG) as cm: | ||
with caplog.at_level(logging.DEBUG, logger="airflow.task"): | ||
k.execute(context) | ||
expected_line = textwrap.dedent( | ||
"""\ | ||
DEBUG:airflow.task.operators:Starting pod: | ||
api_version: v1 | ||
kind: Pod | ||
metadata: | ||
annotations: {} | ||
cluster_name: null | ||
creation_timestamp: null | ||
deletion_grace_period_seconds: null\ | ||
""" | ||
).strip() | ||
assert any(line.startswith(expected_line) for line in cm.output) | ||
expected_line = ( | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Due to the different log format of |
||
r"DEBUG\s+airflow.task.operators.kubernetes_pod.py:\d+\sStarting pod:\n" | ||
r"api_version: v1\n" | ||
r"kind: Pod\n" | ||
r"metadata:\n" | ||
r"\s+annotations: {}\n" | ||
r"\s+cluster_name: null\n" | ||
r"\s+creation_timestamp: null\n" | ||
r"\s+deletion_grace_period_seconds: null\n" | ||
) | ||
assert re.search(expected_line, caplog.text) is not None | ||
|
||
actual_pod = self.api_client.sanitize_for_serialization(k.pod) | ||
expected_dict = { | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Adding support for this required me to move from a
unittest.TestCase
to pytest. This required a couple of other fixes, but is worth it in my mind, since other test classes are using pytest.