Type annotation for KubeDeployment.deployment_version; remove unnecessary deployment_version property on Application

Author: EvanKrall

paasta_tools/kubernetes/application/controller_wrappers.py

@@ -26,7 +26,6 @@
 from paasta_tools.kubernetes_tools import pod_disruption_budget_for_service_instance
 from paasta_tools.kubernetes_tools import update_deployment
 from paasta_tools.kubernetes_tools import update_stateful_set
-from paasta_tools.utils import DeploymentVersion
 from paasta_tools.utils import load_system_paasta_config
 
 
@@ -190,10 +189,6 @@ def ensure_pod_disruption_budget(
                 namespace=pdr.metadata.namespace,
             )
 
-    @property
-    def deployment_version(self):
-        return DeploymentVersion(self.git_sha, self.image_version)
-
 
 class DeploymentWrapper(Application):
     def deep_delete(

paasta_tools/kubernetes_tools.py

@@ -228,7 +228,7 @@ class KubeDeployment(NamedTuple):
     replicas: Optional[int]
 
     @property
-    def deployment_version(self):
+    def deployment_version(self) -> DeploymentVersion:
         return DeploymentVersion(self.git_sha, self.image_version)
 
 

paasta_tools/setup_kubernetes_job.py

@@ -42,6 +42,7 @@
 from paasta_tools.metrics import metrics_lib
 from paasta_tools.utils import decompose_job_id
 from paasta_tools.utils import DEFAULT_SOA_DIR
+from paasta_tools.utils import DeploymentVersion
 from paasta_tools.utils import InvalidJobNameError
 from paasta_tools.utils import load_system_paasta_config
 from paasta_tools.utils import NoConfigurationForServiceError
@@ -214,7 +215,9 @@ def setup_kube_deployments(
             for deployment in existing_kube_deployments
         }
 
-        existing_deployment_versions: Dict[Tuple[str, str, str], List[str]] = {}
+        existing_deployment_versions: Dict[
+            Tuple[str, str, str], List[DeploymentVersion]
+        ] = {}
         for deployment in existing_kube_deployments:
             existing_deployment_versions.setdefault(
                 (deployment.service, deployment.instance, deployment.namespace), []