This is an automated email from the ASF dual-hosted git repository.
eladkal pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new a19a9cb523 removed usage of deprecated function for naming the pod in
provider k8s pod.py (#38638)
a19a9cb523 is described below
commit a19a9cb52388118e5fc735a25cc42229576482ad
Author: Idan Tepper <65827206+idantep...@users.noreply.github.com>
AuthorDate: Fri Apr 5 00:33:40 2024 +0300
removed usage of deprecated function for naming the pod in provider k8s
pod.py (#38638)
* (k8s/operator/pod.py): changed the function used to create pod name,
before used a deprecated one and now using add_uniqu_suffix()
* (k8s/operator/pod.py): changed the function used to create pod id, before
used a deprecated one and now using add_uniqe_id()
* (k8s/operator/k8s_helper_functions.py): changed the function
create_unique_id to use add_unique_suffix before it used a deprecated one
* changed order of imports
* (k8s/pod_generator.py): changed the function construct_pod() to use
add_unique_suffix before it used a deprecated one
* changed imports order in pod_generator
---------
Co-authored-by: idantep...@gmail.com <idantep...@github.com>
---
airflow/providers/cncf/kubernetes/kubernetes_helper_functions.py | 2 +-
airflow/providers/cncf/kubernetes/operators/pod.py | 8 ++++----
airflow/providers/cncf/kubernetes/pod_generator.py | 3 ++-
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/airflow/providers/cncf/kubernetes/kubernetes_helper_functions.py
b/airflow/providers/cncf/kubernetes/kubernetes_helper_functions.py
index 62dc351bbd..9129bdf779 100644
--- a/airflow/providers/cncf/kubernetes/kubernetes_helper_functions.py
+++ b/airflow/providers/cncf/kubernetes/kubernetes_helper_functions.py
@@ -104,7 +104,7 @@ def create_unique_id(
name += task_id
base_name = slugify(name, lowercase=True)[:max_length].strip(".-")
if unique:
- return add_pod_suffix(pod_name=base_name, rand_len=8,
max_len=max_length)
+ return add_unique_suffix(name=base_name, rand_len=8,
max_len=max_length)
else:
return base_name
diff --git a/airflow/providers/cncf/kubernetes/operators/pod.py
b/airflow/providers/cncf/kubernetes/operators/pod.py
index 7f712dba2f..32b361f0cc 100644
--- a/airflow/providers/cncf/kubernetes/operators/pod.py
+++ b/airflow/providers/cncf/kubernetes/operators/pod.py
@@ -62,8 +62,8 @@ from airflow.providers.cncf.kubernetes.callbacks import
ExecutionMode, Kubernete
from airflow.providers.cncf.kubernetes.hooks.kubernetes import KubernetesHook
from airflow.providers.cncf.kubernetes.kubernetes_helper_functions import (
POD_NAME_MAX_LENGTH,
- add_pod_suffix,
- create_pod_id,
+ add_unique_suffix,
+ create_unique_id,
)
from airflow.providers.cncf.kubernetes.pod_generator import PodGenerator
from airflow.providers.cncf.kubernetes.triggers.pod import KubernetesPodTrigger
@@ -1049,12 +1049,12 @@ class KubernetesPodOperator(BaseOperator):
pod = PodGenerator.reconcile_pods(pod_template, pod)
if not pod.metadata.name:
- pod.metadata.name = create_pod_id(
+ pod.metadata.name = create_unique_id(
task_id=self.task_id, unique=self.random_name_suffix,
max_length=POD_NAME_MAX_LENGTH
)
elif self.random_name_suffix:
# user has supplied pod name, we're just adding suffix
- pod.metadata.name = add_pod_suffix(pod_name=pod.metadata.name)
+ pod.metadata.name = add_unique_suffix(name=pod.metadata.name)
if not pod.metadata.namespace:
hook_namespace = self.hook.get_namespace()
diff --git a/airflow/providers/cncf/kubernetes/pod_generator.py
b/airflow/providers/cncf/kubernetes/pod_generator.py
index e9f413985f..8d78145893 100644
--- a/airflow/providers/cncf/kubernetes/pod_generator.py
+++ b/airflow/providers/cncf/kubernetes/pod_generator.py
@@ -46,6 +46,7 @@ from airflow.exceptions import (
from airflow.providers.cncf.kubernetes.kubernetes_helper_functions import (
POD_NAME_MAX_LENGTH,
add_pod_suffix,
+ add_unique_suffix,
rand_str,
)
from airflow.providers.cncf.kubernetes.pod_generator_deprecated import (
@@ -397,7 +398,7 @@ class PodGenerator:
UserWarning,
stacklevel=2,
)
- pod_id = add_pod_suffix(pod_name=pod_id,
max_len=POD_NAME_MAX_LENGTH)
+ pod_id = add_unique_suffix(name=pod_id,
max_len=POD_NAME_MAX_LENGTH)
try:
image = pod_override_object.spec.containers[0].image # type:
ignore
if not image:
