chore: remove duplication of logic

Signed-off-by: Oleksander Piskun <oleksandr2088@icloud.com>

Author: oleksandr-nc

lib/Command/ExApp/Register.php

@@ -217,7 +217,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 					$output->writeln(sprintf('ExApp %s K8s deployment failed. Error: %s', $appId, $deployResult));
 				}
 				$this->exAppService->setStatusError($exApp, $deployResult);
-				$this->_removeK8sResources($harpK8sUrl, $appId, $k8sRoles);
+				$this->kubernetesActions->cleanupResources($harpK8sUrl, $appId, $k8sRoles);
 				$this->_unregisterExApp($appId, $isTestDeployMode);
 				return 1;
 			}
@@ -239,7 +239,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 					$output->writeln(sprintf('ExApp %s K8s expose failed. Error: %s', $appId, $exposeResult['error']));
 				}
 				$this->exAppService->setStatusError($exApp, $exposeResult['error']);
-				$this->_removeK8sResources($harpK8sUrl, $appId, $k8sRoles);
+				$this->kubernetesActions->cleanupResources($harpK8sUrl, $appId, $k8sRoles);
 				$this->_unregisterExApp($appId, $isTestDeployMode);
 				return 1;
 			}
@@ -271,7 +271,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 			}
 			$this->exAppService->setStatusError($exApp, 'Heartbeat check failed');
 			if ($harpK8sUrl !== null) {
-				$this->_removeK8sResources($harpK8sUrl, $appId, $k8sRoles);
+				$this->kubernetesActions->cleanupResources($harpK8sUrl, $appId, $k8sRoles);
 				$this->_unregisterExApp($appId, $isTestDeployMode);
 			}
 			return 1;
@@ -296,17 +296,6 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 		return 0;
 	}
 
-	private function _removeK8sResources(string $harpK8sUrl, string $appId, array $roles): void {
-		if (!empty($roles)) {
-			$error = $this->kubernetesActions->removeAllRoles($harpK8sUrl, $appId, $roles);
-		} else {
-			$error = $this->kubernetesActions->removeExApp($harpK8sUrl, $appId);
-		}
-		if ($error) {
-			$this->logger->warning(sprintf('Failed to clean up K8s resources for %s: %s', $appId, $error));
-		}
-	}
-
 	private function _unregisterExApp(string $appId, bool $testDeployMode = false): void {
 		if ($testDeployMode) {
 			return;

lib/Command/ExApp/Update.php

@@ -253,7 +253,7 @@ private function updateExApp(InputInterface $input, OutputInterface $output, str
 					$output->writeln(sprintf('ExApp %s K8s deployment update failed. Error: %s', $appId, $deployResult));
 				}
 				$this->exAppService->setStatusError($exApp, 'K8s deployment update failed');
-				$this->_removeK8sResources($harpK8sUrl, $appId, $k8sRoles);
+				$this->kubernetesActions->cleanupResources($harpK8sUrl, $appId, $k8sRoles);
 				return 1;
 			}
 
@@ -273,7 +273,7 @@ private function updateExApp(InputInterface $input, OutputInterface $output, str
 					$output->writeln(sprintf('ExApp %s K8s expose failed. Error: %s', $appId, $exposeResult['error']));
 				}
 				$this->exAppService->setStatusError($exApp, $exposeResult['error']);
-				$this->_removeK8sResources($harpK8sUrl, $appId, $k8sRoles);
+				$this->kubernetesActions->cleanupResources($harpK8sUrl, $appId, $k8sRoles);
 				return 1;
 			}
 
@@ -304,7 +304,7 @@ private function updateExApp(InputInterface $input, OutputInterface $output, str
 			}
 			$this->exAppService->setStatusError($exApp, 'Heartbeat check failed');
 			if ($harpK8sUrl !== null) {
-				$this->_removeK8sResources($harpK8sUrl, $appId, $k8sRoles);
+				$this->kubernetesActions->cleanupResources($harpK8sUrl, $appId, $k8sRoles);
 			}
 			return 1;
 		}
@@ -342,14 +342,4 @@ private function updateExApp(InputInterface $input, OutputInterface $output, str
 		return 0;
 	}
 
-	private function _removeK8sResources(string $harpK8sUrl, string $appId, array $roles): void {
-		if (!empty($roles)) {
-			$error = $this->kubernetesActions->removeAllRoles($harpK8sUrl, $appId, $roles);
-		} else {
-			$error = $this->kubernetesActions->removeExApp($harpK8sUrl, $appId);
-		}
-		if ($error) {
-			$this->logger->warning(sprintf('Failed to clean up K8s resources for %s: %s', $appId, $error));
-		}
-	}
 }

lib/DeployActions/KubernetesActions.php

@@ -3,7 +3,7 @@
 declare(strict_types=1);
 
 /**
- * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
@@ -232,6 +232,22 @@ private function rollbackDeployedRoles(string $harpUrl, string $exAppName, array
 		}
 	}
 
+	/**
+	 * Clean up K8s resources for an ExApp (Deployments, Services, etc.).
+	 *
+	 * Dispatches to removeAllRoles() or removeExApp() depending on whether roles are defined.
+	 */
+	public function cleanupResources(string $harpUrl, string $appId, array $roles): void {
+		if (!empty($roles)) {
+			$error = $this->removeAllRoles($harpUrl, $appId, $roles);
+		} else {
+			$error = $this->removeExApp($harpUrl, $appId);
+		}
+		if ($error) {
+			$this->logger->warning(sprintf('Failed to clean up K8s resources for %s: %s', $appId, $error));
+		}
+	}
+
 	/**
 	 * Expose the single entry-point role for a multi-role ExApp.
 	 *