Merge pull request #294 from ibuildthecloud/master

Properly delete releases that have a custom name
rancher · Feb 25, 2021 · e39527f · e39527f
2 parents 873848c + f8008e0
commit e39527f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/modules/agent/pkg/deployer/manager.go b/modules/agent/pkg/deployer/manager.go
@@ -62,7 +62,7 @@ func (m *Manager) Cleanup() error {
 		bundleDeployment, err := m.bundleDeploymentCache.Get(m.fleetNamespace, deployed.BundleID)
 		if apierror.IsNotFound(err) {
 			logrus.Infof("Deleting orphan bundle ID %s, release %s", deployed.BundleID, deployed.ReleaseName)
-			if err := m.deployer.Delete(deployed.BundleID, ""); err != nil {
+			if err := m.deployer.Delete(deployed.BundleID, deployed.ReleaseName); err != nil {
 				return err
 			}
 		} else if err != nil {

diff --git a/pkg/helmdeployer/deployer.go b/pkg/helmdeployer/deployer.go
@@ -428,10 +428,23 @@ func (h *helm) Resources(bundleID, resourcesID string) (*deployer.Resources, err
 }
 
 func (h *helm) Delete(bundleID, releaseName string) error {
-	if releaseName != "" {
-		return h.deleteByRelease(bundleID, releaseName)
+	if releaseName == "" {
+		deployments, err := h.ListDeployments()
+		if err != nil {
+			return err
+		}
+		for _, deployment := range deployments {
+			if deployment.BundleID == bundleID {
+				releaseName = deployment.ReleaseName
+				break
+			}
+		}
+	}
+	if releaseName == "" {
+		// Never found anything to delete
+		return nil
 	}
-	return h.delete(bundleID, fleet.BundleDeploymentOptions{}, false)
+	return h.deleteByRelease(bundleID, releaseName)
 }
 
 func (h *helm) deleteByRelease(bundleID, releaseName string) error {