fix: rm unmanaged pvc before unintall (#110)

beclab · Dec 4, 2024 · c6291b5 · c6291b5
1 parent 9c378b4
commit c6291b5
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/pkg/appinstaller/helm.go b/pkg/appinstaller/helm.go
@@ -630,14 +630,6 @@ func (h *HelmOps) unregisterAppPerm() error {
 
 // Uninstall do a uninstall operation for release.
 func (h *HelmOps) Uninstall() error {
-	err := helm.UninstallCharts(h.actionConfig, h.app.AppName)
-	if err != nil {
-		return err
-	}
-	err = h.unregisterAppPerm()
-	if err != nil {
-		klog.Errorf("Failed to unregister app err=%v", err)
-	}
 	client, err := kubernetes.NewForConfig(h.kubeConfig)
 	if err != nil {
 		return err
@@ -649,10 +641,21 @@ func (h *HelmOps) Uninstall() error {
 		}
 		for _, pvc := range pvcs.Items {
 			err = client.CoreV1().PersistentVolumeClaims(pvc.Namespace).Delete(context.TODO(), pvc.Name, metav1.DeleteOptions{})
-			if err != nil {
+			if err != nil && !apierrors.IsNotFound(err) {
 				return err
 			}
 		}
+	}
+	err = helm.UninstallCharts(h.actionConfig, h.app.AppName)
+	if err != nil {
+		return err
+	}
+	err = h.unregisterAppPerm()
+	if err != nil {
+		klog.Errorf("Failed to unregister app err=%v", err)
+	}
+
+	if !utils.IsProtectedNamespace(h.app.Namespace) {
 		return client.CoreV1().Namespaces().Delete(context.TODO(), h.app.Namespace, metav1.DeleteOptions{})
 	}
 	return nil