fix: e2e tests (#4847)

* fix: pending generator states makes next suite fail

Signed-off-by: Gustavo Carvalho <gustavo@externalsecrets.com>

* fix: fix remaining suites

Signed-off-by: Gustavo Carvalho <gustavo@externalsecrets.com>

---------

Signed-off-by: Gustavo Carvalho <gustavo@externalsecrets.com>

e2e/suites/argocd/suite_test.go

@@ -15,6 +15,7 @@ limitations under the License.
 package argocd
 
 import (
+	"context"
 	"testing"
 
 	// nolint
@@ -25,6 +26,7 @@ import (
 
 	"github.com/external-secrets/external-secrets-e2e/framework/addon"
 	"github.com/external-secrets/external-secrets-e2e/framework/util"
+	genv1alpha1 "github.com/external-secrets/external-secrets/apis/generators/v1alpha1"
 )
 
 var _ = SynchronizedBeforeSuite(func() []byte {
@@ -40,6 +42,17 @@ var _ = SynchronizedBeforeSuite(func() []byte {
 var _ = SynchronizedAfterSuite(func() {
 	// noop
 }, func() {
+	cfg := &addon.Config{}
+	cfg.KubeConfig, cfg.KubeClientSet, cfg.CRClient = util.NewConfig()
+	By("Deleting any pending generator states")
+	generatorStates := &genv1alpha1.GeneratorStateList{}
+	err := cfg.CRClient.List(context.Background(), generatorStates)
+	Expect(err).ToNot(HaveOccurred())
+	for _, generatorState := range generatorStates.Items {
+		err = cfg.CRClient.Delete(context.Background(), &generatorState)
+		Expect(err).ToNot(HaveOccurred())
+	}
+
 	By("Cleaning up global addons")
 	addon.UninstallGlobalAddons()
 	if CurrentSpecReport().Failed() {

e2e/suites/flux/suite_test.go

@@ -15,6 +15,7 @@ limitations under the License.
 package flux
 
 import (
+	"context"
 	"testing"
 
 	// nolint
@@ -25,6 +26,7 @@ import (
 
 	"github.com/external-secrets/external-secrets-e2e/framework/addon"
 	"github.com/external-secrets/external-secrets-e2e/framework/util"
+	genv1alpha1 "github.com/external-secrets/external-secrets/apis/generators/v1alpha1"
 )
 
 var _ = SynchronizedBeforeSuite(func() []byte {
@@ -40,6 +42,17 @@ var _ = SynchronizedBeforeSuite(func() []byte {
 var _ = SynchronizedAfterSuite(func() {
 	// noop
 }, func() {
+	cfg := &addon.Config{}
+	cfg.KubeConfig, cfg.KubeClientSet, cfg.CRClient = util.NewConfig()
+	By("Deleting any pending generator states")
+	generatorStates := &genv1alpha1.GeneratorStateList{}
+	err := cfg.CRClient.List(context.Background(), generatorStates)
+	Expect(err).ToNot(HaveOccurred())
+	for _, generatorState := range generatorStates.Items {
+		err = cfg.CRClient.Delete(context.Background(), &generatorState)
+		Expect(err).ToNot(HaveOccurred())
+	}
+
 	By("Cleaning up global addons")
 	addon.UninstallGlobalAddons()
 	if CurrentSpecReport().Failed() {

e2e/suites/generator/suite_test.go

@@ -15,6 +15,7 @@ limitations under the License.
 package generator
 
 import (
+	"context"
 	"testing"
 
 	// nolint
@@ -24,6 +25,7 @@ import (
 
 	"github.com/external-secrets/external-secrets-e2e/framework/addon"
 	"github.com/external-secrets/external-secrets-e2e/framework/util"
+	genv1alpha1 "github.com/external-secrets/external-secrets/apis/generators/v1alpha1"
 )
 
 var _ = SynchronizedBeforeSuite(func() []byte {
@@ -41,6 +43,16 @@ var _ = SynchronizedBeforeSuite(func() []byte {
 var _ = SynchronizedAfterSuite(func() {
 	// noop
 }, func() {
+	cfg := &addon.Config{}
+	cfg.KubeConfig, cfg.KubeClientSet, cfg.CRClient = util.NewConfig()
+	By("Deleting any pending generator states")
+	generatorStates := &genv1alpha1.GeneratorStateList{}
+	err := cfg.CRClient.List(context.Background(), generatorStates)
+	Expect(err).ToNot(HaveOccurred())
+	for _, generatorState := range generatorStates.Items {
+		err = cfg.CRClient.Delete(context.Background(), &generatorState)
+		Expect(err).ToNot(HaveOccurred())
+	}
 	By("Cleaning up global addons")
 	addon.UninstallGlobalAddons()
 	if CurrentSpecReport().Failed() {

e2e/suites/provider/suite_test.go

@@ -15,16 +15,19 @@ limitations under the License.
 package e2e
 
 import (
+	"context"
 	"testing"
 
 	// nolint
 	. "github.com/onsi/ginkgo/v2"
+
 	// nolint
 	. "github.com/onsi/gomega"
 
 	"github.com/external-secrets/external-secrets-e2e/framework/addon"
 	"github.com/external-secrets/external-secrets-e2e/framework/util"
 	_ "github.com/external-secrets/external-secrets-e2e/suites/provider/cases"
+	genv1alpha1 "github.com/external-secrets/external-secrets/apis/generators/v1alpha1"
 )
 
 var _ = SynchronizedBeforeSuite(func() []byte {
@@ -42,6 +45,16 @@ var _ = SynchronizedBeforeSuite(func() []byte {
 var _ = SynchronizedAfterSuite(func() {
 	// noop
 }, func() {
+	cfg := &addon.Config{}
+	cfg.KubeConfig, cfg.KubeClientSet, cfg.CRClient = util.NewConfig()
+	By("Deleting any pending generator states")
+	generatorStates := &genv1alpha1.GeneratorStateList{}
+	err := cfg.CRClient.List(context.Background(), generatorStates)
+	Expect(err).ToNot(HaveOccurred())
+	for _, generatorState := range generatorStates.Items {
+		err = cfg.CRClient.Delete(context.Background(), &generatorState)
+		Expect(err).ToNot(HaveOccurred())
+	}
 	By("Cleaning up global addons")
 	addon.UninstallGlobalAddons()
 	if CurrentSpecReport().Failed() {