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

Debug instance id

Browse Source 
[ZITADOPER-1]
This commit is contained in:
Haim Kortovich
2024-05-15 14:08:50 -05:00
parent 365d81e48e
commit 6b6d4d66c4
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -373,7 +373,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 { fmt.Println(instance.Id)
if instance.Id != zitadel.Status.DefaultInstanceId || instance.Id == "" {
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 {
@@ -388,7 +389,11 @@ func (r *ZitadelClusterReconciler) reconcileDefaultInstance(ctx context.Context,
if err != nil { if err != nil {
if strings.Contains(err.Error(), "Instance not found") { if strings.Contains(err.Error(), "Instance not found") {
// if Instance doesn't exist, then create and assign secrets // 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 { if err != nil {
return ctrl.Result{}, err return ctrl.Result{}, err
} }