Prevent delete from wiping all artifacts for kind

hiddeco · hiddeco · commit 4bde6bf880c2 · 2020-04-12T22:07:57.000+02:00
diff --git a/controllers/gitrepository_controller.go b/controllers/gitrepository_controller.go
@@ -110,7 +110,7 @@ func (r *GitRepositoryReconciler) SetupWithManager(mgr ctrl.Manager) error {
 					return false
 				}
 				// delete artifacts
-				artifact := r.Storage.ArtifactFor(gvk.Kind, e.Meta, "", "")
+				artifact := r.Storage.ArtifactFor(gvk.Kind, e.Meta, "*", "")
 				if err := r.Storage.RemoveAll(artifact); err != nil {
 					r.Log.Error(err, "unable to delete artifacts",
 						gvk.Kind, fmt.Sprintf("%s/%s", e.Meta.GetNamespace(), e.Meta.GetName()))
diff --git a/controllers/helmchart_controller.go b/controllers/helmchart_controller.go
@@ -117,7 +117,7 @@ func (r *HelmChartReconciler) SetupWithManager(mgr ctrl.Manager) error {
 					return false
 				}
 				// delete artifacts
-				artifact := r.Storage.ArtifactFor(gvk.Kind, e.Meta, "", "")
+				artifact := r.Storage.ArtifactFor(gvk.Kind, e.Meta, "*", "")
 				if err := r.Storage.RemoveAll(artifact); err != nil {
 					r.Log.Error(err, "unable to delete artifacts",
 						gvk.Kind, fmt.Sprintf("%s/%s", e.Meta.GetNamespace(), e.Meta.GetName()))
diff --git a/controllers/helmrepository_controller.go b/controllers/helmrepository_controller.go
@@ -106,7 +106,7 @@ func (r *HelmRepositoryReconciler) SetupWithManager(mgr ctrl.Manager) error {
 					return false
 				}
 				// delete artifacts
-				artifact := r.Storage.ArtifactFor(gvk.Kind, e.Meta, "", "")
+				artifact := r.Storage.ArtifactFor(gvk.Kind, e.Meta, "*", "")
 				if err := r.Storage.RemoveAll(artifact); err != nil {
 					r.Log.Error(err, "unable to delete artifacts",
 						gvk.Kind, fmt.Sprintf("%s/%s", e.Meta.GetNamespace(), e.Meta.GetName()))

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ func (r *GitRepositoryReconciler) SetupWithManager(mgr ctrl.Manager) error {`
`110`	`110`	`return false`
`111`	`111`	`}`
`112`	`112`	`// delete artifacts`
`113`		`- artifact := r.Storage.ArtifactFor(gvk.Kind, e.Meta, "", "")`
	`113`	`+ artifact := r.Storage.ArtifactFor(gvk.Kind, e.Meta, "*", "")`
`114`	`114`	`if err := r.Storage.RemoveAll(artifact); err != nil {`
`115`	`115`	`r.Log.Error(err, "unable to delete artifacts",`
`116`	`116`	`gvk.Kind, fmt.Sprintf("%s/%s", e.Meta.GetNamespace(), e.Meta.GetName()))`
Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ func (r *HelmChartReconciler) SetupWithManager(mgr ctrl.Manager) error {`
`117`	`117`	`return false`
`118`	`118`	`}`
`119`	`119`	`// delete artifacts`
`120`		`- artifact := r.Storage.ArtifactFor(gvk.Kind, e.Meta, "", "")`
	`120`	`+ artifact := r.Storage.ArtifactFor(gvk.Kind, e.Meta, "*", "")`
`121`	`121`	`if err := r.Storage.RemoveAll(artifact); err != nil {`
`122`	`122`	`r.Log.Error(err, "unable to delete artifacts",`
`123`	`123`	`gvk.Kind, fmt.Sprintf("%s/%s", e.Meta.GetNamespace(), e.Meta.GetName()))`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ func (r *HelmRepositoryReconciler) SetupWithManager(mgr ctrl.Manager) error {`
`106`	`106`	`return false`
`107`	`107`	`}`
`108`	`108`	`// delete artifacts`
`109`		`- artifact := r.Storage.ArtifactFor(gvk.Kind, e.Meta, "", "")`
	`109`	`+ artifact := r.Storage.ArtifactFor(gvk.Kind, e.Meta, "*", "")`
`110`	`110`	`if err := r.Storage.RemoveAll(artifact); err != nil {`
`111`	`111`	`r.Log.Error(err, "unable to delete artifacts",`
`112`	`112`	`gvk.Kind, fmt.Sprintf("%s/%s", e.Meta.GetNamespace(), e.Meta.GetName()))`