From f5f28151e11a5542d304cc48e6af9f11b09e2e20 Mon Sep 17 00:00:00 2001
From: Jarek Potiuk <jarek@potiuk.com>
Date: Mon, 9 Nov 2020 10:23:35 +0100
Subject: [PATCH] Revert "Randomize pod name (#12117)"

This reverts commit 7825be50d80d04da0db8fcee55df5e1339864c88.
---
 .../kubernetes/operators/kubernetes_pod.py    |  2 +-
 .../operators/test_kubernetes_pod.py          | 27 -------------------
 2 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/airflow/providers/cncf/kubernetes/operators/kubernetes_pod.py b/airflow/providers/cncf/kubernetes/operators/kubernetes_pod.py
index 7c976bc96f099..c71f067ec223a 100644
--- a/airflow/providers/cncf/kubernetes/operators/kubernetes_pod.py
+++ b/airflow/providers/cncf/kubernetes/operators/kubernetes_pod.py
@@ -384,7 +384,7 @@ def create_pod_request_obj(self) -> k8s.V1Pod:
             metadata=k8s.V1ObjectMeta(
                 namespace=self.namespace,
                 labels=self.labels,
-                name=PodGenerator.make_unique_pod_id(self.name),
+                name=self.name,
                 annotations=self.annotations,
             ),
             spec=k8s.V1PodSpec(
diff --git a/tests/providers/cncf/kubernetes/operators/test_kubernetes_pod.py b/tests/providers/cncf/kubernetes/operators/test_kubernetes_pod.py
index bfef5e51bd61a..b30ca24b9e98c 100644
--- a/tests/providers/cncf/kubernetes/operators/test_kubernetes_pod.py
+++ b/tests/providers/cncf/kubernetes/operators/test_kubernetes_pod.py
@@ -137,30 +137,3 @@ def test_jinja_templated_fields(self):
         self.assertEqual(task.image, "{{ image_jinja }}:16.04")
         task.render_template_fields(context={"image_jinja": "ubuntu"})
         self.assertEqual(task.image, "ubuntu:16.04")
-
-    @mock.patch("airflow.kubernetes.pod_launcher.PodLauncher.start_pod")
-    @mock.patch("airflow.kubernetes.pod_launcher.PodLauncher.monitor_pod")
-    @mock.patch("airflow.kubernetes.kube_client.get_kube_client")
-    def test_randomize_pod_name(self, mock_client, monitor_mock, start_mock):
-        from airflow.utils.state import State
-
-        name_base = 'test'
-
-        k = KubernetesPodOperator(
-            namespace='default',
-            image="ubuntu:16.04",
-            cmds=["bash", "-cx"],
-            arguments=["echo 10"],
-            labels={"foo": "bar"},
-            name=name_base,
-            task_id="task",
-            in_cluster=False,
-            do_xcom_push=False,
-            cluster_context='default',
-        )
-        monitor_mock.return_value = (State.SUCCESS, None)
-        context = self.create_context(k)
-        k.execute(context=context)
-
-        assert start_mock.call_args[0][0].metadata.name.startswith(name_base)
-        assert start_mock.call_args[0][0].metadata.name != name_base