From 6b6d4d66c4dad6b7593cfd2594b6f9f14d3ec188 Mon Sep 17 00:00:00 2001 From: Haim Kortovich Date: Wed, 15 May 2024 14:08:50 -0500 Subject: [PATCH] Debug instance id [ZITADOPER-1] --- src/internal/controller/zitadelcluster_controller.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/internal/controller/zitadelcluster_controller.go b/src/internal/controller/zitadelcluster_controller.go index e84351c..e0d0f09 100644 --- a/src/internal/controller/zitadelcluster_controller.go +++ b/src/internal/controller/zitadelcluster_controller.go @@ -373,7 +373,8 @@ 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 { + fmt.Println(instance.Id) + if instance.Id != zitadel.Status.DefaultInstanceId || instance.Id == "" { fmt.Println("DELETING INSTANCE") _, err := ztdClient.RemoveInstance(ctx, &pb.RemoveInstanceRequest{InstanceId: instance.Id}) if err != nil { @@ -388,7 +389,11 @@ func (r *ZitadelClusterReconciler) reconcileDefaultInstance(ctx context.Context, if err != nil { if strings.Contains(err.Error(), "Instance not found") { // if Instance doesn't exist, then create and assign secrets - resp, err := ztdClient.CreateInstance(ctx, &pb.CreateInstanceRequest{InstanceName: "DEFAULT", FirstOrgName: "DEFAULT", CustomDomain: zitadel.Spec.Host, Owner: &pb.CreateInstanceRequest_Machine_{Machine: &pb.CreateInstanceRequest_Machine{Name: "k8s-operator", UserName: "k8s-operator", MachineKey: &pb.CreateInstanceRequest_MachineKey{Type: authn.KeyType_KEY_TYPE_JSON}, PersonalAccessToken: &pb.CreateInstanceRequest_PersonalAccessToken{}}}}) + resp, err := ztdClient.CreateInstance(ctx, &pb.CreateInstanceRequest{ + InstanceName: "DEFAULT", + FirstOrgName: "DEFAULT", + CustomDomain: zitadel.Spec.Host, + Owner: &pb.CreateInstanceRequest_Machine_{Machine: &pb.CreateInstanceRequest_Machine{Name: "k8s-operator", UserName: "k8s-operator", MachineKey: &pb.CreateInstanceRequest_MachineKey{Type: authn.KeyType_KEY_TYPE_JSON}, PersonalAccessToken: &pb.CreateInstanceRequest_PersonalAccessToken{}}}}) if err != nil { return ctrl.Result{}, err }