fix(controller): registry status condition constants

Signed-off-by: Fabrizio Sestito <[email protected]>
rancher-sandbox · Oct 18, 2024 · 22c6ff7 · 22c6ff7
1 parent 66792b3
commit 22c6ff7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/api/v1alpha1/registry_types.go b/api/v1alpha1/registry_types.go
@@ -46,13 +46,13 @@ type RegistrySpec struct {
 }
 
 const (
-	DiscoveringCondition = "Discovering"
-	DiscoveredCondition  = "Discovered"
+	RegistryDiscoveringCondition = "Discovering"
+	RegistryDiscoveredCondition  = "Discovered"
 )
 
 const (
-	DiscoveryRequestedReason       = "DiscoveryRequested"
-	FailedToRequestDiscoveryReason = "FailedToRequestDiscovery"
+	RegistryDiscoveryRequestedReason       = "DiscoveryRequested"
+	RegistryFailedToRequestDiscoveryReason = "FailedToRequestDiscovery"
 )
 
 // RegistryStatus defines the observed state of Registry

diff --git a/internal/controller/registry_controller.go b/internal/controller/registry_controller.go
@@ -66,9 +66,9 @@ func (r *RegistryReconciler) Reconcile(ctx context.Context, req ctrl.Request) (c
 		}
 		if err := r.Publisher.Publish(&msg); err != nil {
 			meta.SetStatusCondition(&registry.Status.Conditions, metav1.Condition{
-				Type:    v1alpha1.RegistryConditionDiscovering,
+				Type:    v1alpha1.RegistryDiscoveringCondition,
 				Status:  metav1.ConditionUnknown,
-				Reason:  v1alpha1.RegistryReasonFailedToRequestDiscovery,
+				Reason:  v1alpha1.RegistryFailedToRequestDiscoveryReason,
 				Message: "Failed to communicate with the workers",
 			})
 			if err := r.Status().Update(ctx, &registry); err != nil {
@@ -80,9 +80,9 @@ func (r *RegistryReconciler) Reconcile(ctx context.Context, req ctrl.Request) (c
 
 		meta.SetStatusCondition(&registry.Status.Conditions,
 			metav1.Condition{
-				Type:    v1alpha1.RegistryConditionDiscovering,
+				Type:    v1alpha1.RegistryDiscoveringCondition,
 				Status:  metav1.ConditionTrue,
-				Reason:  v1alpha1.RegistryReasonDiscoveryRequested,
+				Reason:  v1alpha1.RegistryDiscoveryRequestedReason,
 				Message: "Registry discovery in progress",
 			})
 		if err := r.Status().Update(ctx, &registry); err != nil {

diff --git a/internal/controller/registry_controller_test.go b/internal/controller/registry_controller_test.go
@@ -95,7 +95,7 @@ var _ = Describe("Registry Controller", func() {
 				}, Equal(metav1.Condition{
 					Type:    "Discovering",
 					Status:  metav1.ConditionTrue,
-					Reason:  v1alpha1.DiscoveryRequestedReason,
+					Reason:  v1alpha1.RegistryDiscoveryRequestedReason,
 					Message: "Registry discovery in progress",
 				}))))
 		})
@@ -135,7 +135,7 @@ var _ = Describe("Registry Controller", func() {
 				}, Equal(metav1.Condition{
 					Type:    "Discovering",
 					Status:  metav1.ConditionUnknown,
-					Reason:  v1alpha1.FailedToRequestDiscoveryReason,
+					Reason:  v1alpha1.RegistryFailedToRequestDiscoveryReason,
 					Message: "Failed to communicate with the workers",
 				}))))
 		})