Skip to content

Commit e56dfca

Browse files
authored
Merge pull request #5531 from fluxcd/uninstall-artifact-generator
Remove `ArtifactGenerators` during uninstall
2 parents 7a2f77f + 56e73ae commit e56dfca

File tree

1 file changed

+16
-0
lines changed

1 file changed

+16
-0
lines changed

pkg/uninstall/uninstall.go

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ import (
3535
notificationv1 "github.com/fluxcd/notification-controller/api/v1"
3636
notificationv1b3 "github.com/fluxcd/notification-controller/api/v1beta3"
3737
sourcev1 "github.com/fluxcd/source-controller/api/v1"
38+
swapi "github.com/fluxcd/source-watcher/api/v2/v1beta1"
3839

3940
"github.com/fluxcd/flux2/v2/pkg/log"
4041
"github.com/fluxcd/flux2/v2/pkg/manifestgen"
@@ -332,6 +333,21 @@ func Finalizers(ctx context.Context, logger log.Logger, kubeClient client.Client
332333
}
333334
}
334335
}
336+
{
337+
var list swapi.ArtifactGeneratorList
338+
if err := kubeClient.List(ctx, &list, client.InNamespace("")); err == nil {
339+
for i := range list.Items {
340+
r := list.Items[i]
341+
r.Finalizers = []string{}
342+
if err := kubeClient.Update(ctx, &r, opts); err != nil {
343+
logger.Failuref("%s/%s/%s removing finalizers failed: %s", r.Kind, r.Namespace, r.Name, err.Error())
344+
aggregateErr = append(aggregateErr, err)
345+
} else {
346+
logger.Successf("%s/%s/%s finalizers deleted %s", r.Kind, r.Namespace, r.Name, dryRunStr)
347+
}
348+
}
349+
}
350+
}
335351
return errors.Reduce(errors.Flatten(errors.NewAggregate(aggregateErr)))
336352
}
337353

0 commit comments

Comments
 (0)