From e00d976565a4fe169d7c8c3ba38ad9d63c3b56e3 Mon Sep 17 00:00:00 2001
From: Haim Kortovich <haim.kortovich@topmanage.com>
Date: Tue, 28 May 2024 18:12:31 -0500
Subject: [PATCH] Fix instance deletion

[ZITADOPER-1]
---
 src/internal/controller/zitadelcluster_controller.go | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/internal/controller/zitadelcluster_controller.go b/src/internal/controller/zitadelcluster_controller.go
index 0f95807..d673e40 100644
--- a/src/internal/controller/zitadelcluster_controller.go
+++ b/src/internal/controller/zitadelcluster_controller.go
@@ -383,11 +383,13 @@ func (r *ZitadelClusterReconciler) reconcileDefaultInstance(ctx context.Context,
 			return ctrl.Result{}, fmt.Errorf("Error listing instances: %v", err)
 		}
 		for _, instance := range resp.Result {
-			if instance.Id != zitadel.Status.DefaultInstanceId || instance.Id == "" {
-				fmt.Println("DELETING INSTANCE")
-				_, err := ztdClient.RemoveInstance(ctx, &pb.RemoveInstanceRequest{InstanceId: instance.Id})
-				if err != nil {
-					return ctrl.Result{}, err
+			if instance != nil {
+				if instance.Id != zitadel.Status.DefaultInstanceId || zitadel.Status.DefaultInstanceId == "" {
+					fmt.Println("DELETING INSTANCE")
+					_, err := ztdClient.RemoveInstance(ctx, &pb.RemoveInstanceRequest{InstanceId: instance.Id})
+					if err != nil {
+						return ctrl.Result{}, err
+					}
 				}
 			}
 		}