From 5e0febed82e5ffcda8e7586185902602bda927b1 Mon Sep 17 00:00:00 2001 From: Simon Osipov Date: Thu, 24 Jun 2021 19:46:52 +0300 Subject: [PATCH 1/2] Added dashes to pod naming --- airflow/kubernetes/kubernetes_helper_functions.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/airflow/kubernetes/kubernetes_helper_functions.py b/airflow/kubernetes/kubernetes_helper_functions.py index da58a38cb2956..092e3265c0319 100644 --- a/airflow/kubernetes/kubernetes_helper_functions.py +++ b/airflow/kubernetes/kubernetes_helper_functions.py @@ -29,15 +29,13 @@ def _strip_unsafe_kubernetes_special_chars(string: str) -> str: """ Kubernetes only supports lowercase alphanumeric characters, "-" and "." in the pod name. - However, there are special rules about how "-" and "." can be used so let's - only keep - alphanumeric chars see here for detail: + See here for detail: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/ :param string: The requested Pod name :return: Pod name stripped of any unsafe characters """ - return ''.join(ch.lower() for ch in list(string) if ch.isalnum()) + return ''.join(ch.lower() for ch in list(string) if ch.isalnum() or ch in ['-']) def create_pod_id(dag_id: str, task_id: str) -> str: @@ -52,7 +50,7 @@ def create_pod_id(dag_id: str, task_id: str) -> str: """ safe_dag_id = _strip_unsafe_kubernetes_special_chars(dag_id) safe_task_id = _strip_unsafe_kubernetes_special_chars(task_id) - return safe_dag_id + safe_task_id + return safe_dag_id + "-" + safe_task_id def annotations_to_key(annotations: Dict[str, str]) -> Optional[TaskInstanceKey]: From a274efc5fd58f672025bf37958deb2e8114c92da Mon Sep 17 00:00:00 2001 From: Simon Osipov Date: Thu, 24 Jun 2021 20:44:00 +0300 Subject: [PATCH 2/2] Replaced string concatenation with f-string Co-authored-by: Tzu-ping Chung --- airflow/kubernetes/kubernetes_helper_functions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airflow/kubernetes/kubernetes_helper_functions.py b/airflow/kubernetes/kubernetes_helper_functions.py index 092e3265c0319..6cff10c416367 100644 --- a/airflow/kubernetes/kubernetes_helper_functions.py +++ b/airflow/kubernetes/kubernetes_helper_functions.py @@ -50,7 +50,7 @@ def create_pod_id(dag_id: str, task_id: str) -> str: """ safe_dag_id = _strip_unsafe_kubernetes_special_chars(dag_id) safe_task_id = _strip_unsafe_kubernetes_special_chars(task_id) - return safe_dag_id + "-" + safe_task_id + return f"{safe_dag_id}-{safe_task_id}" def annotations_to_key(annotations: Dict[str, str]) -> Optional[TaskInstanceKey]: