Remove all domains before deleting instance

[ZITADOPER-1]
This commit is contained in:
Haim Kortovich
2024-05-28 19:52:55 -05:00
parent 53647672cd
commit a562485a62

View File

@@ -389,9 +389,20 @@ func (r *ZitadelClusterReconciler) reconcileDefaultInstance(ctx context.Context,
if err != nil { if err != nil {
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 != nil { if instance != nil {
if instance.Id != zitadel.Status.DefaultInstanceId || zitadel.Status.DefaultInstanceId == "" { if instance.Id != zitadel.Status.DefaultInstanceId || zitadel.Status.DefaultInstanceId == "" {
for _, domain := range instance.Domains {
if domain != nil {
if _, err := ztdClient.RemoveDomain(ctx, &pb.RemoveDomainRequest{
InstanceId: instance.Id,
Domain: domain.Domain,
}); err != nil {
return ctrl.Result{}, fmt.Errorf("Error removing domain in instance: %v", err)
}
}
}
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 {