github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(apps): for helm uninstall, ignore manual associated resource deletion [r8s-124] (#103)

release/2.24.0
Ali 2024-11-12 09:03:22 +13:00 committed by GitHub
parent ad19b4a421
commit 1ead121c9b
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/react/kubernetes/applications/queries/useDeleteApplicationsMutation.ts
View File

@ -115,13 +115,19 @@ async function deleteApplications(
); );
// update associated k8s ressources // update associated k8s ressources
const servicesToDelete = getServicesFromApplications(applications); // helm uninstall will update associated k8s ressources for helm apps, so don't manually delete Helm app associated k8s resources
const nonHelmApplications = applications.filter(
(app) => app.ApplicationType !== 'Helm'
);
const servicesToDelete = getServicesFromApplications(nonHelmApplications);
// axios error handling is done inside deleteServices already // axios error handling is done inside deleteServices already
await deleteServices({ if (Object.keys(servicesToDelete).length > 0) {
environmentId, await deleteServices({
data: servicesToDelete, environmentId,
}); data: servicesToDelete,
const hpasToDelete = applications });
}
const hpasToDelete = nonHelmApplications
.map((app) => app.HorizontalPodAutoscaler) .map((app) => app.HorizontalPodAutoscaler)
.filter((hpa) => !!hpa); .filter((hpa) => !!hpa);
const settledHpaDeletions = await getAllSettledItems(hpasToDelete, (hpa) => const settledHpaDeletions = await getAllSettledItems(hpasToDelete, (hpa) =>