Skip to content

Commit 00bc3f9

Browse files
ObuManfelix-kaestner
authored andcommitted
Add Configured condition to AccessControlList controller
Signed-off-by: Vasyl Paliuha <vasyl.paliuha@sap.com>
1 parent 21aa520 commit 00bc3f9

5 files changed

Lines changed: 20 additions & 10 deletions

File tree

‎api/core/v1alpha1/acl_types.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ type AccessControlListStatus struct {
122122
// +kubebuilder:printcolumn:name="Device",type=string,JSONPath=`.spec.deviceRef.name`
123123
// +kubebuilder:printcolumn:name="Entries",type=string,JSONPath=`.status.entriesSummary`,priority=1
124124
// +kubebuilder:printcolumn:name="Ready",type=string,JSONPath=`.status.conditions[?(@.type=="Ready")].status`
125+
// +kubebuilder:printcolumn:name="Configured",type=string,JSONPath=`.status.conditions[?(@.type=="Configured")].status`,priority=1
125126
// +kubebuilder:printcolumn:name="Paused",type=string,JSONPath=`.status.conditions[?(@.type=="Paused")].status`,priority=1
126127
// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
127128

‎charts/network-operator/templates/crd/accesscontrollists.networking.metal.ironcore.dev.yaml‎

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config/crd/bases/networking.metal.ironcore.dev_accesscontrollists.yaml‎

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/controller/core/acl_controller.go‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ func (r *AccessControlListReconciler) Reconcile(ctx context.Context, req ctrl.Re
170170
return ctrl.Result{}, nil
171171
}
172172

173-
if conditions.InitializeConditions(obj, v1alpha1.ReadyCondition) {
173+
if conditions.InitializeConditions(obj, v1alpha1.ReadyCondition, v1alpha1.ConfiguredCondition) {
174174
log.V(1).Info("Initializing status conditions")
175175
return ctrl.Result{}, r.Status().Update(ctx, obj)
176176
}
@@ -263,6 +263,7 @@ type aclScope struct {
263263
}
264264

265265
func (r *AccessControlListReconciler) reconcile(ctx context.Context, s *aclScope) (reterr error) {
266+
defer conditions.RecomputeReady(s.ACL)
266267
if s.ACL.Labels == nil {
267268
s.ACL.Labels = make(map[string]string)
268269
}
@@ -298,8 +299,6 @@ func (r *AccessControlListReconciler) reconcile(ctx context.Context, s *aclScope
298299
})
299300

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

305304
return err
@@ -341,11 +340,11 @@ func (r *AccessControlListReconciler) deviceToAccessControlLists(ctx context.Con
341340
}
342341

343342
requests := make([]ctrl.Request, 0, len(list.Items))
344-
for _, i := range list.Items {
345-
log.V(2).Info("Enqueuing AccessControlList for reconciliation", "AccessControlList", klog.KObj(&i))
343+
for i := range list.Items {
344+
log.V(2).Info("Enqueuing AccessControlList for reconciliation", "AccessControlList", klog.KObj(&list.Items[i]))
346345
requests = append(requests, ctrl.Request{
347-
Name: i.Name,
348-
Namespace: i.Namespace,
346+
Name: list.Items[i].Name,
347+
Namespace: list.Items[i].Namespace,
349348
})
350349
}
351350

‎internal/controller/core/acl_controller_test.go‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,11 +122,13 @@ var _ = Describe("AccessControlList Controller", func() {
122122
Eventually(func(g Gomega) {
123123
resource := &v1alpha1.AccessControlList{}
124124
g.Expect(k8sClient.Get(ctx, key, resource)).To(Succeed())
125-
g.Expect(resource.Status.Conditions).To(HaveLen(2))
125+
g.Expect(resource.Status.Conditions).To(HaveLen(3))
126126
g.Expect(resource.Status.Conditions[0].Type).To(Equal(v1alpha1.ReadyCondition))
127127
g.Expect(resource.Status.Conditions[0].Status).To(Equal(metav1.ConditionTrue))
128-
g.Expect(resource.Status.Conditions[1].Type).To(Equal(v1alpha1.PausedCondition))
129-
g.Expect(resource.Status.Conditions[1].Status).To(Equal(metav1.ConditionFalse))
128+
g.Expect(resource.Status.Conditions[1].Type).To(Equal(v1alpha1.ConfiguredCondition))
129+
g.Expect(resource.Status.Conditions[1].Status).To(Equal(metav1.ConditionTrue))
130+
g.Expect(resource.Status.Conditions[2].Type).To(Equal(v1alpha1.PausedCondition))
131+
g.Expect(resource.Status.Conditions[2].Status).To(Equal(metav1.ConditionFalse))
130132
}).Should(Succeed())
131133

132134
By("Ensuring the resource is created in the provider")

0 commit comments

Comments
 (0)