Bump task_processing to get watcher_kubeconfig_paths change

Yelp · Jul 10, 2024 · 48a5b4a · 48a5b4a
1 parent 433b9d8
commit 48a5b4a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/requirements-minimal.txt b/requirements-minimal.txt
@@ -21,7 +21,7 @@ pytimeparse
 pytz
 PyYAML>=5.1
 requests
-task_processing[mesos_executor,k8s]>=1.1.0
+task_processing[mesos_executor,k8s]>=1.2.0
 Twisted>=19.7.0
 urllib3>=1.24.2
 Werkzeug>=0.15.3
diff --git a/requirements.txt b/requirements.txt
@@ -80,7 +80,7 @@ setuptools==65.5.1
 six==1.15.0
 sshpubkeys==3.1.0
 stack-data==0.6.2
-task-processing==1.1.0
+task-processing==1.2.0
 traitlets==5.0.0
 Twisted==22.10.0
 typing-extensions==4.5.0

diff --git a/tron/config/schema.py b/tron/config/schema.py
@@ -120,7 +120,7 @@ def config_object_factory(name, required=None, optional=None):
         "kubeconfig_path",
         "enabled",
         "default_volumes",
-        "old_kubeconfig_paths",
+        "watcher_kubeconfig_paths",
     ],
 )
 

diff --git a/tron/kubernetes.py b/tron/kubernetes.py
@@ -280,14 +280,14 @@ def __init__(
         enabled: bool = True,
         default_volumes: Optional[List[ConfigVolume]] = None,
         pod_launch_timeout: Optional[int] = None,
-        old_kubeconfig_paths: Optional[List[str]] = None,
+        watcher_kubeconfig_paths: Optional[List[str]] = None,
     ):
         # general k8s config
         self.kubeconfig_path = kubeconfig_path
         self.enabled = enabled
         self.default_volumes: Optional[List[ConfigVolume]] = default_volumes or []
         self.pod_launch_timeout = pod_launch_timeout or DEFAULT_POD_LAUNCH_TIMEOUT_S
-        self.old_kubeconfig_paths = old_kubeconfig_paths or ()
+        self.watcher_kubeconfig_paths = watcher_kubeconfig_paths or ()
         # creating a task_proc executor has a couple steps:
         # * create a TaskProcessor
         # * load the desired plugin (in this case, the k8s one)
@@ -342,7 +342,7 @@ def get_runner(self, kubeconfig_path: str, queue: PyDeferredQueue) -> Optional[S
                     "namespace": "tron",
                     "version": __version__,
                     "kubeconfig_path": self.kubeconfig_path,
-                    "old_kubeconfig_paths": self.old_kubeconfig_paths,
+                    "watcher_kubeconfig_paths": self.watcher_kubeconfig_paths,
                     "task_configs": [task.get_config() for task in self.tasks.values()],
                 },
             )
@@ -624,7 +624,7 @@ class KubernetesClusterRepository:
     kubeconfig_path: Optional[str] = None
     pod_launch_timeout: Optional[int] = None
     default_volumes: Optional[List[ConfigVolume]] = None
-    old_kubeconfig_paths: Optional[Collection[str]] = ()
+    watcher_kubeconfig_paths: Optional[Collection[str]] = ()
 
     # metadata config
     clusters: Dict[str, KubernetesCluster] = {}
@@ -650,7 +650,7 @@ def get_cluster(cls, kubeconfig_path: Optional[str] = None) -> Optional[Kubernet
                 kubeconfig_path=kubeconfig_path,
                 enabled=cls.kubernetes_enabled,
                 default_volumes=cls.default_volumes,
-                old_kubeconfig_paths=cls.old_kubeconfig_paths,
+                watcher_kubeconfig_paths=cls.watcher_kubeconfig_paths,
             )
             cls.clusters[kubeconfig_path] = cluster
 
@@ -666,7 +666,7 @@ def configure(cls, kubernetes_options: ConfigKubernetes) -> None:
         cls.kubeconfig_path = kubernetes_options.kubeconfig_path
         cls.kubernetes_enabled = kubernetes_options.enabled
         cls.default_volumes = kubernetes_options.default_volumes
-        cls.old_kubeconfig_paths = kubernetes_options.old_kubeconfig_paths
+        cls.watcher_kubeconfig_paths = kubernetes_options.watcher_kubeconfig_paths
 
         for cluster in cls.clusters.values():
             cluster.set_enabled(cls.kubernetes_enabled)