You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by ka...@apache.org on 2021/01/08 21:13:06 UTC
[airflow] branch master updated: Fix depcrecated K8S api (#13575)
This is an automated email from the ASF dual-hosted git repository.
kaxilnaik pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/master by this push:
new f1b71d2 Fix depcrecated K8S api (#13575)
f1b71d2 is described below
commit f1b71d2be7fe8d9c59c4a488563e44e4076de985
Author: Xinbin Huang <bi...@gmail.com>
AuthorDate: Fri Jan 8 13:12:54 2021 -0800
Fix depcrecated K8S api (#13575)
Fix this K8S client deprecation warnings
```
/usr/local/lib/python3.6/site-packages/kubernetes/client/apis/__init__.py:12: DeprecationWarning: The package kubernetes.client.apis is renamed and deprecated, use kubernetes.client.api instead (please note that the trailing s was removed).
DeprecationWarning
```
---
.../kubernetes/operators/test_spark_kubernetes.py | 8 +++----
.../kubernetes/sensors/test_spark_kubernetes.py | 26 +++++++++++-----------
2 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/tests/providers/cncf/kubernetes/operators/test_spark_kubernetes.py b/tests/providers/cncf/kubernetes/operators/test_spark_kubernetes.py
index 44ffec6..49e3ec0 100644
--- a/tests/providers/cncf/kubernetes/operators/test_spark_kubernetes.py
+++ b/tests/providers/cncf/kubernetes/operators/test_spark_kubernetes.py
@@ -176,7 +176,7 @@ class TestSparkKubernetesOperator(unittest.TestCase):
args = {'owner': 'airflow', 'start_date': timezone.datetime(2020, 2, 1)}
self.dag = DAG('test_dag_id', default_args=args)
- @patch('kubernetes.client.apis.custom_objects_api.CustomObjectsApi.create_namespaced_custom_object')
+ @patch('kubernetes.client.api.custom_objects_api.CustomObjectsApi.create_namespaced_custom_object')
def test_create_application_from_yaml(self, mock_create_namespaced_crd, mock_kubernetes_hook):
op = SparkKubernetesOperator(
application_file=TEST_VALID_APPLICATION_YAML,
@@ -194,7 +194,7 @@ class TestSparkKubernetesOperator(unittest.TestCase):
version='v1beta2',
)
- @patch('kubernetes.client.apis.custom_objects_api.CustomObjectsApi.create_namespaced_custom_object')
+ @patch('kubernetes.client.api.custom_objects_api.CustomObjectsApi.create_namespaced_custom_object')
def test_create_application_from_json(self, mock_create_namespaced_crd, mock_kubernetes_hook):
op = SparkKubernetesOperator(
application_file=TEST_VALID_APPLICATION_JSON,
@@ -212,7 +212,7 @@ class TestSparkKubernetesOperator(unittest.TestCase):
version='v1beta2',
)
- @patch('kubernetes.client.apis.custom_objects_api.CustomObjectsApi.create_namespaced_custom_object')
+ @patch('kubernetes.client.api.custom_objects_api.CustomObjectsApi.create_namespaced_custom_object')
def test_namespace_from_operator(self, mock_create_namespaced_crd, mock_kubernetes_hook):
op = SparkKubernetesOperator(
application_file=TEST_VALID_APPLICATION_JSON,
@@ -231,7 +231,7 @@ class TestSparkKubernetesOperator(unittest.TestCase):
version='v1beta2',
)
- @patch('kubernetes.client.apis.custom_objects_api.CustomObjectsApi.create_namespaced_custom_object')
+ @patch('kubernetes.client.api.custom_objects_api.CustomObjectsApi.create_namespaced_custom_object')
def test_namespace_from_connection(self, mock_create_namespaced_crd, mock_kubernetes_hook):
op = SparkKubernetesOperator(
application_file=TEST_VALID_APPLICATION_JSON,
diff --git a/tests/providers/cncf/kubernetes/sensors/test_spark_kubernetes.py b/tests/providers/cncf/kubernetes/sensors/test_spark_kubernetes.py
index 3e18771..437c48b 100644
--- a/tests/providers/cncf/kubernetes/sensors/test_spark_kubernetes.py
+++ b/tests/providers/cncf/kubernetes/sensors/test_spark_kubernetes.py
@@ -508,7 +508,7 @@ class TestSparkKubernetesSensor(unittest.TestCase):
self.dag = DAG("test_dag_id", default_args=args)
@patch(
- "kubernetes.client.apis.custom_objects_api.CustomObjectsApi.get_namespaced_custom_object",
+ "kubernetes.client.api.custom_objects_api.CustomObjectsApi.get_namespaced_custom_object",
return_value=TEST_COMPLETED_APPLICATION,
)
def test_completed_application(self, mock_get_namespaced_crd, mock_kubernetes_hook):
@@ -524,7 +524,7 @@ class TestSparkKubernetesSensor(unittest.TestCase):
)
@patch(
- "kubernetes.client.apis.custom_objects_api.CustomObjectsApi.get_namespaced_custom_object",
+ "kubernetes.client.api.custom_objects_api.CustomObjectsApi.get_namespaced_custom_object",
return_value=TEST_FAILED_APPLICATION,
)
def test_failed_application(self, mock_get_namespaced_crd, mock_kubernetes_hook):
@@ -540,7 +540,7 @@ class TestSparkKubernetesSensor(unittest.TestCase):
)
@patch(
- "kubernetes.client.apis.custom_objects_api.CustomObjectsApi.get_namespaced_custom_object",
+ "kubernetes.client.api.custom_objects_api.CustomObjectsApi.get_namespaced_custom_object",
return_value=TEST_NOT_PROCESSED_APPLICATION,
)
def test_not_processed_application(self, mock_get_namespaced_crd, mock_kubernetes_hook):
@@ -556,7 +556,7 @@ class TestSparkKubernetesSensor(unittest.TestCase):
)
@patch(
- "kubernetes.client.apis.custom_objects_api.CustomObjectsApi.get_namespaced_custom_object",
+ "kubernetes.client.api.custom_objects_api.CustomObjectsApi.get_namespaced_custom_object",
return_value=TEST_NEW_APPLICATION,
)
def test_new_application(self, mock_get_namespaced_crd, mock_kubernetes_hook):
@@ -572,7 +572,7 @@ class TestSparkKubernetesSensor(unittest.TestCase):
)
@patch(
- "kubernetes.client.apis.custom_objects_api.CustomObjectsApi.get_namespaced_custom_object",
+ "kubernetes.client.api.custom_objects_api.CustomObjectsApi.get_namespaced_custom_object",
return_value=TEST_RUNNING_APPLICATION,
)
def test_running_application(self, mock_get_namespaced_crd, mock_kubernetes_hook):
@@ -588,7 +588,7 @@ class TestSparkKubernetesSensor(unittest.TestCase):
)
@patch(
- "kubernetes.client.apis.custom_objects_api.CustomObjectsApi.get_namespaced_custom_object",
+ "kubernetes.client.api.custom_objects_api.CustomObjectsApi.get_namespaced_custom_object",
return_value=TEST_SUBMITTED_APPLICATION,
)
def test_submitted_application(self, mock_get_namespaced_crd, mock_kubernetes_hook):
@@ -604,7 +604,7 @@ class TestSparkKubernetesSensor(unittest.TestCase):
)
@patch(
- "kubernetes.client.apis.custom_objects_api.CustomObjectsApi.get_namespaced_custom_object",
+ "kubernetes.client.api.custom_objects_api.CustomObjectsApi.get_namespaced_custom_object",
return_value=TEST_PENDING_RERUN_APPLICATION,
)
def test_pending_rerun_application(self, mock_get_namespaced_crd, mock_kubernetes_hook):
@@ -620,7 +620,7 @@ class TestSparkKubernetesSensor(unittest.TestCase):
)
@patch(
- "kubernetes.client.apis.custom_objects_api.CustomObjectsApi.get_namespaced_custom_object",
+ "kubernetes.client.api.custom_objects_api.CustomObjectsApi.get_namespaced_custom_object",
return_value=TEST_UNKNOWN_APPLICATION,
)
def test_unknown_application(self, mock_get_namespaced_crd, mock_kubernetes_hook):
@@ -636,7 +636,7 @@ class TestSparkKubernetesSensor(unittest.TestCase):
)
@patch(
- "kubernetes.client.apis.custom_objects_api.CustomObjectsApi.get_namespaced_custom_object",
+ "kubernetes.client.api.custom_objects_api.CustomObjectsApi.get_namespaced_custom_object",
return_value=TEST_COMPLETED_APPLICATION,
)
def test_namespace_from_sensor(self, mock_get_namespaced_crd, mock_kubernetes_hook):
@@ -658,7 +658,7 @@ class TestSparkKubernetesSensor(unittest.TestCase):
)
@patch(
- "kubernetes.client.apis.custom_objects_api.CustomObjectsApi.get_namespaced_custom_object",
+ "kubernetes.client.api.custom_objects_api.CustomObjectsApi.get_namespaced_custom_object",
return_value=TEST_COMPLETED_APPLICATION,
)
def test_namespace_from_connection(self, mock_get_namespaced_crd, mock_kubernetes_hook):
@@ -679,7 +679,7 @@ class TestSparkKubernetesSensor(unittest.TestCase):
)
@patch(
- "kubernetes.client.apis.custom_objects_api.CustomObjectsApi.get_namespaced_custom_object",
+ "kubernetes.client.api.custom_objects_api.CustomObjectsApi.get_namespaced_custom_object",
return_value=TEST_FAILED_APPLICATION,
)
@patch("logging.Logger.error")
@@ -701,7 +701,7 @@ class TestSparkKubernetesSensor(unittest.TestCase):
error_log_call.assert_called_once_with(TEST_POD_LOG_RESULT)
@patch(
- "kubernetes.client.apis.custom_objects_api.CustomObjectsApi.get_namespaced_custom_object",
+ "kubernetes.client.api.custom_objects_api.CustomObjectsApi.get_namespaced_custom_object",
return_value=TEST_COMPLETED_APPLICATION,
)
@patch("logging.Logger.info")
@@ -725,7 +725,7 @@ class TestSparkKubernetesSensor(unittest.TestCase):
self.assertEqual(log_value, TEST_POD_LOG_RESULT)
@patch(
- "kubernetes.client.apis.custom_objects_api.CustomObjectsApi.get_namespaced_custom_object",
+ "kubernetes.client.api.custom_objects_api.CustomObjectsApi.get_namespaced_custom_object",
return_value=TEST_COMPLETED_APPLICATION,
)
@patch("logging.Logger.warning")