@@ -248,19 +248,26 @@ destroyH dName = do
248248 log = logInfo (logger st)
249249 pgPool = pool st
250250 liftIO $ do
251− let appArgs' = destroyAppArgs dName
252− log $ "call " <> unwords (pack helmBin : appArgs')
253− ec1 <- destroyApp appArgs' helmBin
254− let infraArgs = destroyInfraArgs dName
255− log $ "call " <> unwords (pack helmBin : infraArgs)
256− ec2 <- destroyInfra infraArgs helmBin
257− let deletePVCArgs' = deletePVCArgs dName
258− log $ "call " <> unwords (pack kubectlBin : deletePVCArgs')
259− ec3 <- deletePVC deletePVCArgs' kubectlBin
251+ ec1 <- do
252+ let appArgs' = destroyAppArgs dName
253+ log $ "call " <> unwords (pack helmBin : appArgs')
254+ destroyApp appArgs' helmBin
255+ ec2 <- do
256+ let infraArgs = destroyInfraArgs dName
257+ log $ "call " <> unwords (pack helmBin : infraArgs)
258+ destroyInfra infraArgs helmBin
259+ ec3 <- do
260+ let deletePVCArgs' = deletePVCArgs dName
261+ log $ "call " <> unwords (pack kubectlBin : deletePVCArgs')
262+ deletePVC deletePVCArgs' kubectlBin
263+ ec4 <- do
264+ let deleteCertArgs' = deleteCertArgs dName
265+ log $ "call " <> unwords (pack kubectlBin : deleteCertArgs')
266+ deleteCert deleteCertArgs' kubectlBin
260267 void $ deleteDeploymentLogs pgPool dName
261268 void $ deleteDeployment pgPool dName
262269 log $ "deployment destroyed, name: " <> coerce dName
263− handleExitCode $ ec1 `max` ec2 `max` ec3
270+ handleExitCode $ maximum [ec1, ec2, ec3, ec4]
264271 pure NoContent
265272
266273destroyApp :: [CommandArg] -> FilePath -> IO ExitCode
@@ -275,6 +282,9 @@ deletePVC :: [CommandArg] -> FilePath -> IO ExitCode
275282deletePVC args kubectlBin =
276283 withProcessWait (proc kubectlBin $ unpack <$> args) waitProcess
277284
285+deleteCert :: [CommandArg] -> FilePath -> IO ExitCode
286+deleteCert = deletePVC
287+
278288deleteDeploymentLogs :: PgPool -> DeploymentName -> IO Int64
279289deleteDeploymentLogs p n = withResource p $ \conn -> execute
280290 conn