move fetching of image tag to clean

bakdata · Jul 9, 2024 · b482f7f · b482f7f
1 parent 2b54163
commit b482f7f
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 21 deletions.
diff --git a/kpops/components/base_components/kafka_app.py b/kpops/components/base_components/kafka_app.py
@@ -110,6 +110,9 @@ async def clean(self, dry_run: bool) -> None:
         log.info(f"Uninstall old cleanup job for {self.helm_release_name}")
         await self.destroy(dry_run)
 
+        image_tag = self.fetch_image_tag()
+        self.app.image_tag = image_tag
+
         log.info(f"Init cleanup job for {self.helm_release_name}")
         await self.deploy(dry_run)
 

diff --git a/kpops/components/streams_bootstrap/__init__.py b/kpops/components/streams_bootstrap/__init__.py
@@ -67,29 +67,26 @@ class StreamsBootstrap(HelmApp, ABC):
     )
 
     @cached_property
-    def app_values(self) -> dict[str, Any]:
-        streams_bootstrap_app_values = self.model_dump(
-            by_alias=True, exclude={"_cleaner", "from_", "to"}
-        )
+    def cleaner_values(self) -> dict[str, Any]:
+        return self.model_dump(by_alias=True, exclude={"_cleaner", "from_", "to"})
+
+    def fetch_image_tag(self) -> str:
+        """Fetch the image tag of the streams-bootstrap app using the 'helm get values' command.
+
+        If the release doesn't exist, it will fall back to the specified imageTag in the default.yaml/pipeline.yaml
+
+        :return: Image tag of the streams-bootstrap app
+        """
         cluster_values = self.helm.get_values(self.namespace, self.helm_release_name)
+        streams_bootstrap_app_values = StreamsBootstrapValues(
+            **self.model_dump(by_alias=True, exclude={"_cleaner", "from_", "to"})
+        )
         return (
-            streams_bootstrap_app_values
-            if cluster_values is None
-            else self.replace_image_tag_with_cluster_image_tag(
-                cluster_values, streams_bootstrap_app_values
-            )
+            cluster_values["imageTag"]
+            if cluster_values
+            else streams_bootstrap_app_values.image_tag
         )
 
-    @staticmethod
-    def replace_image_tag_with_cluster_image_tag(
-        cluster_values: dict[str, Any], streams_bootstrap_app_values: dict[str, Any]
-    ) -> dict[str, Any]:
-        app_values = streams_bootstrap_app_values.get("app")
-        if app_values:
-            app_values["imageTag"] = cluster_values["imageTag"]
-
-        return streams_bootstrap_app_values
-
     @pydantic.model_validator(mode="after")
     def warning_for_latest_image_tag(self) -> Self:
         if self.validate_ and self.app.image_tag == "latest":

diff --git a/kpops/components/streams_bootstrap/producer/producer_app.py b/kpops/components/streams_bootstrap/producer/producer_app.py
@@ -56,7 +56,7 @@ class ProducerApp(KafkaApp, StreamsBootstrap):
     @cached_property
     def _cleaner(self) -> ProducerAppCleaner:
         return ProducerAppCleaner(
-            config=self.config, handlers=self.handlers, **self.app_values
+            config=self.config, handlers=self.handlers, **self.cleaner_values
         )
 
     @override

diff --git a/kpops/components/streams_bootstrap/streams/streams_app.py b/kpops/components/streams_bootstrap/streams/streams_app.py
@@ -63,7 +63,7 @@ class StreamsApp(KafkaApp, StreamsBootstrap):
     @cached_property
     def _cleaner(self) -> StreamsAppCleaner:
         return StreamsAppCleaner(
-            config=self.config, handlers=self.handlers, **self.app_values
+            config=self.config, handlers=self.handlers, **self.cleaner_values
         )
 
     @property