From 26c882f0fa8912c2cf15172647ff9651fff07dcb Mon Sep 17 00:00:00 2001 From: Felix Kunde Date: Wed, 30 Mar 2022 16:30:36 +0200 Subject: [PATCH] fix deletion of event streams --- pkg/cluster/streams.go | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkg/cluster/streams.go b/pkg/cluster/streams.go index 7325fa857..8b62c86b5 100644 --- a/pkg/cluster/streams.go +++ b/pkg/cluster/streams.go @@ -45,9 +45,18 @@ func (c *Cluster) deleteStreams() error { return nil } - err = c.KubeClient.FabricEventStreams(c.Namespace).Delete(context.TODO(), c.Name, metav1.DeleteOptions{}) - if err != nil { - return fmt.Errorf("could not delete event stream custom resource: %v", err) + errors := make([]string, 0) + appIds := gatherApplicationIds(c.Spec.Streams) + for _, appId := range appIds { + fesName := fmt.Sprintf("%s-%s", c.Name, appId) + err = c.KubeClient.FabricEventStreams(c.Namespace).Delete(context.TODO(), fesName, metav1.DeleteOptions{}) + if err != nil { + errors = append(errors, fmt.Sprintf("could not delete event stream %q: %v", fesName, err)) + } + } + + if len(errors) > 0 { + return fmt.Errorf("could not delete all event stream custom resources: %v", strings.Join(errors, `', '`)) } return nil