software-engineering/zitadel-k8s-operator
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in feature/ZITADOPER-1-initial-operator-build (pull request #2)

Browse Source 
Fix instance deletion
This commit is contained in:
Haim Kortovich
2024-05-28 23:21:31 +00:00
parent dc273583dc e00d976565
commit 75212d000d
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/internal/controller/zitadelcluster_controller.go
View File

@@ -383,7 +383,8 @@ func (r *ZitadelClusterReconciler) reconcileDefaultInstance(ctx context.Context,
return ctrl.Result{}, fmt.Errorf("Error listing instances: %v", err) return ctrl.Result{}, fmt.Errorf("Error listing instances: %v", err)
} }
for _, instance := range resp.Result { for _, instance := range resp.Result {
if instance.Id != zitadel.Status.DefaultInstanceId || instance.Id == "" { if instance != nil {
if instance.Id != zitadel.Status.DefaultInstanceId || zitadel.Status.DefaultInstanceId == "" {
fmt.Println("DELETING INSTANCE") fmt.Println("DELETING INSTANCE")
_, err := ztdClient.RemoveInstance(ctx, &pb.RemoveInstanceRequest{InstanceId: instance.Id}) _, err := ztdClient.RemoveInstance(ctx, &pb.RemoveInstanceRequest{InstanceId: instance.Id})
if err != nil { if err != nil {
@@ -392,6 +393,7 @@ func (r *ZitadelClusterReconciler) reconcileDefaultInstance(ctx context.Context,
} }
} }
} }
}
// Check if instance already exists // Check if instance already exists
_, err = ztdClient.GetInstance(ctx, &pb.GetInstanceRequest{InstanceId: zitadel.Status.DefaultInstanceId}) _, err = ztdClient.GetInstance(ctx, &pb.GetInstanceRequest{InstanceId: zitadel.Status.DefaultInstanceId})