fix cleanup

kyma-project · Jan 7, 2025 · 1d622e3 · 1d622e3
1 parent efffa6d
commit 1d622e3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/internal/controller/kyma/controller.go b/internal/controller/kyma/controller.go
@@ -99,7 +99,7 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu
 		if util.IsNotFound(err) {
 			logger.V(log.DebugLevel).Info(fmt.Sprintf("Kyma %s not found, probably already deleted",
 				req.NamespacedName))
-			if err = r.handleOrphanedResourcesDeletion(ctx, kyma); err != nil {
+			if err = r.handleOrphanedResourcesDeletion(ctx, req.Name); err != nil {
 				return ctrl.Result{}, err
 			}
 			return ctrl.Result{Requeue: false}, nil
@@ -627,8 +627,8 @@ func (r *Reconciler) UpdateModuleTemplatesIfNeeded(ctx context.Context) error {
 	return nil
 }
 
-func (r *Reconciler) handleOrphanedResourcesDeletion(ctx context.Context, kyma *v1beta2.Kyma) error {
-	if err := r.SKRWebhookManager.RemoveKCPCertificate(ctx, kyma); err != nil {
+func (r *Reconciler) handleOrphanedResourcesDeletion(ctx context.Context, kymaName string) error {
+	if err := r.SKRWebhookManager.RemoveKCPCertificate(ctx, kymaName); err != nil {
 		return err
 	}
 

diff --git a/pkg/watcher/skr_webhook_manifest_manager.go b/pkg/watcher/skr_webhook_manifest_manager.go
@@ -147,7 +147,7 @@ func (m *SKRWebhookManifestManager) Remove(ctx context.Context, kyma *v1beta2.Ky
 		return fmt.Errorf("failed to get skrContext: %w", err)
 	}
 
-	if err = m.RemoveKCPCertificate(ctx, kyma); err != nil {
+	if err = m.RemoveKCPCertificate(ctx, kyma.Name); err != nil {
 		return err
 	}
 
@@ -172,8 +172,8 @@ func (m *SKRWebhookManifestManager) Remove(ctx context.Context, kyma *v1beta2.Ky
 	return nil
 }
 
-func (m *SKRWebhookManifestManager) RemoveKCPCertificate(ctx context.Context, kyma *v1beta2.Kyma) error {
-	certificate := NewCertificateManager(m.kcpClient, kyma.Name,
+func (m *SKRWebhookManifestManager) RemoveKCPCertificate(ctx context.Context, kymaName string) error {
+	certificate := NewCertificateManager(m.kcpClient, kymaName,
 		m.certificateConfig)
 	if err := certificate.Remove(ctx); err != nil {
 		return err

diff --git a/tests/e2e/watcher_test.go b/tests/e2e/watcher_test.go
@@ -35,7 +35,6 @@ var _ = Describe("Enqueue Event from Watcher", Ordered, func() {
 		kyma.GetNamespace(), kyma.GetName())
 
 	InitEmptyKymaBeforeAll(kyma)
-	CleanupKymaAfterAll(kyma)
 	secretName := types.NamespacedName{
 		Name:      watcher.SkrTLSName,
 		Namespace: RemoteNamespace,