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

Debug errors

Browse Source 
[ZITADOPER-1]
This commit is contained in:
Haim Kortovich
2024-05-15 14:22:18 -05:00
parent 6b6d4d66c4
commit 25d4b7da82
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -107,9 +107,6 @@ func (r *ZitadelClusterReconciler) Reconcile(ctx context.Context, req ctrl.Reque
return ctrl.Result{}, client.IgnoreNotFound(err) return ctrl.Result{}, client.IgnoreNotFound(err)
} }
if err := r.patchStatus(ctx, &zitadel, r.patcher(ctx, &zitadel)); err != nil && !errors.IsNotFound(err) {
return ctrl.Result{}, err
}
phases := []reconcilePhase{ phases := []reconcilePhase{
{ {
Name: "Spec", Name: "Spec",
@@ -181,6 +178,10 @@ func (r *ZitadelClusterReconciler) Reconcile(ctx context.Context, req ctrl.Reque
return result, err return result, err
} }
} }
if err := r.patchStatus(ctx, &zitadel, r.patcher(ctx, &zitadel)); err != nil && !errors.IsNotFound(err) {
return ctrl.Result{}, err
}
return ctrl.Result{RequeueAfter: 5 * time.Minute}, nil return ctrl.Result{RequeueAfter: 5 * time.Minute}, nil
} }
@@ -373,7 +374,6 @@ 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 {
fmt.Println(instance.Id)
if instance.Id != zitadel.Status.DefaultInstanceId || 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})
@@ -393,9 +393,15 @@ func (r *ZitadelClusterReconciler) reconcileDefaultInstance(ctx context.Context,
InstanceName: "DEFAULT", InstanceName: "DEFAULT",
FirstOrgName: "DEFAULT", FirstOrgName: "DEFAULT",
CustomDomain: zitadel.Spec.Host, 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{}}}}) 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{}, fmt.Errorf("Error creating default instance: %v", err)
} }
var machineKeyData zitadelClient.MachineKey var machineKeyData zitadelClient.MachineKey
if err := json.Unmarshal(resp.MachineKey, &machineKeyData); err != nil { if err := json.Unmarshal(resp.MachineKey, &machineKeyData); err != nil {
@@ -423,7 +429,7 @@ func (r *ZitadelClusterReconciler) reconcileDefaultInstance(ctx context.Context,
zitadel.Status.DefaultInstanceId = resp.InstanceId zitadel.Status.DefaultInstanceId = resp.InstanceId
return ctrl.Result{}, r.Status().Patch(ctx, zitadel, patch) return ctrl.Result{}, r.Status().Patch(ctx, zitadel, patch)
} else { } else {
return ctrl.Result{}, err return ctrl.Result{}, fmt.Errorf("Error getting instance with id: %s: %v", zitadel.Status.DefaultInstanceId, err)
} }
} }
@@ -462,7 +468,7 @@ func (r *ZitadelClusterReconciler) patcher(ctx context.Context, zitadel *zitadel
} }
zitadel.Status.Replicas = sts.Status.ReadyReplicas zitadel.Status.Replicas = sts.Status.ReadyReplicas
condition.SetReadyWithDeployment(&zitadel.Status, &sts) condition.SetReadyWithDeployment(&zitadel.Status, &sts, zitadel.Status.DefaultInstanceId)
return nil return nil
} }
} }

4
src/pkg/condition/ready.go
View File

@@ -51,8 +51,8 @@ func SetReadyFailed(c Conditioner) {
SetReadyFailedWithMessage(c, "Failed") SetReadyFailedWithMessage(c, "Failed")
} }
func SetReadyWithDeployment(c Conditioner, sts *appsv1.Deployment) { func SetReadyWithDeployment(c Conditioner, sts *appsv1.Deployment, instanceId string) {
if sts.Status.Replicas == 0 || sts.Status.ReadyReplicas != sts.Status.Replicas { if sts.Status.Replicas == 0 || sts.Status.ReadyReplicas != sts.Status.Replicas || instanceId != "" {
c.SetCondition(metav1.Condition{ c.SetCondition(metav1.Condition{
Type: zitadelv1alpha1.ConditionTypeReady, Type: zitadelv1alpha1.ConditionTypeReady,
Status: metav1.ConditionFalse, Status: metav1.ConditionFalse,