Skip to content

Add Configured condition to Syslog controller #685

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
felix-kaestner merged 1 commit into from
Oct 26, 2026
Merged

Add Configured condition to Syslog controller #685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions api/core/v1alpha1/syslog_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ type SyslogStatus struct {
// +kubebuilder:printcolumn:name="Device",type=string,JSONPath=`.spec.deviceRef.name`
// +kubebuilder:printcolumn:name="Servers",type=string,JSONPath=`.status.serversSummary`,priority=1
// +kubebuilder:printcolumn:name="Ready",type=string,JSONPath=`.status.conditions[?(@.type=="Ready")].status`
// +kubebuilder:printcolumn:name="Configured",type=string,JSONPath=`.status.conditions[?(@.type=="Configured")].status`,priority=1
// +kubebuilder:printcolumn:name="Paused",type=string,JSONPath=`.status.conditions[?(@.type=="Paused")].status`,priority=1
// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"

Expand Down
4 changes: 4 additions & 0 deletions charts/network-operator/templates/crd/syslogs.networking.metal.ironcore.dev.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions config/crd/bases/networking.metal.ironcore.dev_syslogs.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 6 additions & 5 deletions internal/controller/core/syslog_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ func (r *SyslogReconciler) Reconcile(ctx context.Context, req ctrl.Request) (_ c
return ctrl.Result{}, nil
}

if conditions.InitializeConditions(obj, v1alpha1.ReadyCondition) {
if conditions.InitializeConditions(obj, v1alpha1.ReadyCondition, v1alpha1.ConfiguredCondition) {
log.V(1).Info("Initializing status conditions")
return ctrl.Result{}, r.Status().Update(ctx, obj)
}
Expand Down Expand Up @@ -269,6 +269,10 @@ func (r *SyslogReconciler) reconcile(ctx context.Context, s *syslogScope) (reter

s.Syslog.Labels[v1alpha1.DeviceLabel] = s.Device.Name

defer func() {
conditions.RecomputeReady(s.Syslog)
}()

// Ensure the Syslog is owned by the Device.
if !controllerutil.HasControllerReference(s.Syslog) {
if err := controllerutil.SetOwnerReference(s.Device, s.Syslog, r.Scheme, controllerutil.WithBlockOwnerDeletion(true)); err != nil {
Expand Down Expand Up @@ -297,10 +301,7 @@ func (r *SyslogReconciler) reconcile(ctx context.Context, s *syslogScope) (reter
ProviderConfig: s.ProviderConfig,
})

cond := conditions.FromError(err)
// As this resource is configuration only, we use the Configured condition as top-level Ready condition.
cond.Type = v1alpha1.ReadyCondition
conditions.Set(s.Syslog, cond)
conditions.Set(s.Syslog, conditions.FromError(err))

return err
}
Expand Down
8 changes: 5 additions & 3 deletions internal/controller/core/syslog_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,11 +115,13 @@ var _ = Describe("Syslog Controller", func() {
Eventually(func(g Gomega) {
resource := &v1alpha1.Syslog{}
g.Expect(k8sClient.Get(ctx, key, resource)).To(Succeed())
g.Expect(resource.Status.Conditions).To(HaveLen(2))
g.Expect(resource.Status.Conditions).To(HaveLen(3))
g.Expect(resource.Status.Conditions[0].Type).To(Equal(v1alpha1.ReadyCondition))
g.Expect(resource.Status.Conditions[0].Status).To(Equal(metav1.ConditionTrue))
g.Expect(resource.Status.Conditions[1].Type).To(Equal(v1alpha1.PausedCondition))
g.Expect(resource.Status.Conditions[1].Status).To(Equal(metav1.ConditionFalse))
g.Expect(resource.Status.Conditions[1].Type).To(Equal(v1alpha1.ConfiguredCondition))
g.Expect(resource.Status.Conditions[1].Status).To(Equal(metav1.ConditionTrue))
g.Expect(resource.Status.Conditions[2].Type).To(Equal(v1alpha1.PausedCondition))
g.Expect(resource.Status.Conditions[2].Status).To(Equal(metav1.ConditionFalse))
}).Should(Succeed())

By("Ensuring the resource is created in the provider")
Expand Down
Loading