You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by po...@apache.org on 2020/10/09 22:49:29 UTC
[airflow] branch master updated:
[airflow/providers/cncf/kubernetes] correct hook methods name (#11008)
This is an automated email from the ASF dual-hosted git repository.
potiuk 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 298052f [airflow/providers/cncf/kubernetes] correct hook methods name (#11008)
298052f is described below
commit 298052fcee9d30b1f60b8dc1c9006398cd16645e
Author: Đặng Minh Dũng <du...@live.com>
AuthorDate: Sat Oct 10 05:48:47 2020 +0700
[airflow/providers/cncf/kubernetes] correct hook methods name (#11008)
---
airflow/providers/cncf/kubernetes/hooks/kubernetes.py | 12 ++++++------
.../providers/cncf/kubernetes/operators/spark_kubernetes.py | 2 +-
.../providers/cncf/kubernetes/sensors/spark_kubernetes.py | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/airflow/providers/cncf/kubernetes/hooks/kubernetes.py b/airflow/providers/cncf/kubernetes/hooks/kubernetes.py
index e7ead21..3af1a2e 100644
--- a/airflow/providers/cncf/kubernetes/hooks/kubernetes.py
+++ b/airflow/providers/cncf/kubernetes/hooks/kubernetes.py
@@ -109,7 +109,7 @@ class KubernetesHook(BaseHook):
"""Cached Kubernetes API client"""
return self.get_conn()
- def create_custom_resource_definition(
+ def create_custom_object(
self, group: str, version: str, plural: str, body: Union[str, dict], namespace: Optional[str] = None
):
"""
@@ -138,9 +138,9 @@ class KubernetesHook(BaseHook):
self.log.debug("Response: %s", response)
return response
except client.rest.ApiException as e:
- raise AirflowException("Exception when calling -> create_custom_resource_definition: %s\n" % e)
+ raise AirflowException("Exception when calling -> create_custom_object: %s\n" % e)
- def get_custom_resource_definition(
+ def get_custom_object(
self, group: str, version: str, plural: str, name: str, namespace: Optional[str] = None
):
"""
@@ -157,16 +157,16 @@ class KubernetesHook(BaseHook):
:param namespace: kubernetes namespace
:type namespace: str
"""
- custom_resource_definition_api = client.CustomObjectsApi(self.api_client)
+ api = client.CustomObjectsApi(self.api_client)
if namespace is None:
namespace = self.get_namespace()
try:
- response = custom_resource_definition_api.get_namespaced_custom_object(
+ response = api.get_namespaced_custom_object(
group=group, version=version, namespace=namespace, plural=plural, name=name
)
return response
except client.rest.ApiException as e:
- raise AirflowException("Exception when calling -> get_custom_resource_definition: %s\n" % e)
+ raise AirflowException("Exception when calling -> get_custom_object: %s\n" % e)
def get_namespace(self) -> str:
"""
diff --git a/airflow/providers/cncf/kubernetes/operators/spark_kubernetes.py b/airflow/providers/cncf/kubernetes/operators/spark_kubernetes.py
index b971e8f2..1589d59 100644
--- a/airflow/providers/cncf/kubernetes/operators/spark_kubernetes.py
+++ b/airflow/providers/cncf/kubernetes/operators/spark_kubernetes.py
@@ -59,7 +59,7 @@ class SparkKubernetesOperator(BaseOperator):
def execute(self, context):
self.log.info("Creating sparkApplication")
hook = KubernetesHook(conn_id=self.kubernetes_conn_id)
- response = hook.create_custom_resource_definition(
+ response = hook.create_custom_object(
group="sparkoperator.k8s.io",
version="v1beta2",
plural="sparkapplications",
diff --git a/airflow/providers/cncf/kubernetes/sensors/spark_kubernetes.py b/airflow/providers/cncf/kubernetes/sensors/spark_kubernetes.py
index 19d4af0..6b4ddee 100644
--- a/airflow/providers/cncf/kubernetes/sensors/spark_kubernetes.py
+++ b/airflow/providers/cncf/kubernetes/sensors/spark_kubernetes.py
@@ -85,7 +85,7 @@ class SparkKubernetesSensor(BaseSensorOperator):
def poke(self, context: Dict) -> bool:
self.log.info("Poking: %s", self.application_name)
- response = self.hook.get_custom_resource_definition(
+ response = self.hook.get_custom_object(
group="sparkoperator.k8s.io",
version="v1beta2",
plural="sparkapplications",