Skip to content

Commit 5761130

Browse files
ObuManfelix-kaestner
authored andcommitted
Add Configured condition to ManagementAccess controller
Signed-off-by: Vasyl Paliuha <vasyl.paliuha@sap.com>
1 parent f20ab07 commit 5761130

5 files changed

Lines changed: 18 additions & 6 deletions

File tree

‎api/core/v1alpha1/managementaccess_types.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ type ManagementAccessStatus struct {
149149
// +kubebuilder:printcolumn:name="gRPC",type=boolean,JSONPath=`.spec.grpc.enabled`
150150
// +kubebuilder:printcolumn:name="gRPC Port",type=integer,JSONPath=`.spec.grpc.port`,priority=1
151151
// +kubebuilder:printcolumn:name="Ready",type=string,JSONPath=`.status.conditions[?(@.type=="Ready")].status`
152+
// +kubebuilder:printcolumn:name="Configured",type=string,JSONPath=`.status.conditions[?(@.type=="Configured")].status`,priority=1
152153
// +kubebuilder:printcolumn:name="Paused",type=string,JSONPath=`.status.conditions[?(@.type=="Paused")].status`,priority=1
153154
// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
154155

‎charts/network-operator/templates/crd/managementaccesses.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_managementaccesses.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/managementaccess_controller.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ func (r *ManagementAccessReconciler) Reconcile(ctx context.Context, req ctrl.Req
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
}
@@ -269,6 +269,8 @@ func (r *ManagementAccessReconciler) reconcile(ctx context.Context, s *managemen
269269

270270
s.ManagementAccess.Labels[v1alpha1.DeviceLabel] = s.Device.Name
271271

272+
defer conditions.RecomputeReady(s.ManagementAccess)
273+
272274
// Ensure the ManagementAccess is owned by the Device.
273275
if !controllerutil.HasControllerReference(s.ManagementAccess) {
274276
if err := controllerutil.SetOwnerReference(s.Device, s.ManagementAccess, r.Scheme, controllerutil.WithBlockOwnerDeletion(true)); err != nil {
@@ -292,8 +294,7 @@ func (r *ManagementAccessReconciler) reconcile(ctx context.Context, s *managemen
292294
})
293295

294296
cond := conditions.FromError(err)
295-
// As this resource is configuration only, we use the Configured condition as top-level Ready condition.
296-
cond.Type = v1alpha1.ReadyCondition
297+
297298
conditions.Set(s.ManagementAccess, cond)
298299

299300
return err

‎internal/controller/core/managementaccess_controller_test.go‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,11 +106,13 @@ var _ = Describe("ManagementAccess Controller", func() {
106106
Eventually(func(g Gomega) {
107107
resource := &v1alpha1.ManagementAccess{}
108108
g.Expect(k8sClient.Get(ctx, key, resource)).To(Succeed())
109-
g.Expect(resource.Status.Conditions).To(HaveLen(2))
109+
g.Expect(resource.Status.Conditions).To(HaveLen(3))
110110
g.Expect(resource.Status.Conditions[0].Type).To(Equal(v1alpha1.ReadyCondition))
111111
g.Expect(resource.Status.Conditions[0].Status).To(Equal(metav1.ConditionTrue))
112-
g.Expect(resource.Status.Conditions[1].Type).To(Equal(v1alpha1.PausedCondition))
113-
g.Expect(resource.Status.Conditions[1].Status).To(Equal(metav1.ConditionFalse))
112+
g.Expect(resource.Status.Conditions[1].Type).To(Equal(v1alpha1.ConfiguredCondition))
113+
g.Expect(resource.Status.Conditions[1].Status).To(Equal(metav1.ConditionTrue))
114+
g.Expect(resource.Status.Conditions[2].Type).To(Equal(v1alpha1.PausedCondition))
115+
g.Expect(resource.Status.Conditions[2].Status).To(Equal(metav1.ConditionFalse))
114116
}).Should(Succeed())
115117

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

0 commit comments

Comments
 (0)