Revert WorkloadStatus field to DeploymentStatus to keep backward compatible

Author: eliranb

api/v1beta/lightrunjavaagent_types.go

@@ -81,15 +81,16 @@ type LightrunJavaAgentSpec struct {
 type LightrunJavaAgentStatus struct {
 	LastScheduleTime *metav1.Time       `json:"lastScheduleTime,omitempty"`
 	Conditions       []metav1.Condition `json:"conditions,omitempty"`
-	WorkloadStatus   string             `json:"workloadStatus,omitempty"`
+	// TODO rename status field to more agnostic name such as "Status"
+	DeploymentStatus string `json:"deploymentStatus,omitempty"`
 }
 
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
 //+kubebuilder:resource:shortName=lrja
 //+kubebuilder:printcolumn:priority=0,name=Deployment,type=string,JSONPath=".spec.deploymentName",description="Deployment name",format=""
 //+kubebuilder:printcolumn:priority=0,name=StatefulSet,type=string,JSONPath=".spec.statefulSetName",description="StatefulSet name",format=""
-//+kubebuilder:printcolumn:priority=0,name="Status",type=string,JSONPath=".status.workloadStatus",description="Status of Workload Reconciliation",format=""
+//+kubebuilder:printcolumn:priority=0,name="Status",type=string,JSONPath=".status.deploymentStatus",description="Status of Deployment Reconciliation",format=""
 //+kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
 
 // LightrunJavaAgent is the Schema for the lightrunjavaagents API

internal/controller/helpers.go

@@ -121,7 +121,7 @@ func (r *LightrunJavaAgentReconciler) successStatus(ctx context.Context, instanc
 		Status:             metav1.ConditionTrue,
 	}
 	SetStatusCondition(&instance.Status.Conditions, condition)
-	instance.Status.WorkloadStatus = r.findLastConditionType(&instance.Status.Conditions)
+	instance.Status.DeploymentStatus = r.findLastConditionType(&instance.Status.Conditions)
 	err := r.Status().Update(ctx, instance)
 	if err != nil {
 		if apierrors.IsConflict(err) {
@@ -147,7 +147,7 @@ func (r *LightrunJavaAgentReconciler) errorStatus(ctx context.Context, instance
 		Status:             metav1.ConditionTrue,
 	}
 	SetStatusCondition(&instance.Status.Conditions, condition)
-	instance.Status.WorkloadStatus = r.findLastConditionType(&instance.Status.Conditions)
+	instance.Status.DeploymentStatus = r.findLastConditionType(&instance.Status.Conditions)
 	err := r.Status().Update(ctx, instance)
 	if err != nil {
 		if apierrors.IsConflict(err) {

internal/controller/lightrunjavaagent_controller_test.go

@@ -714,7 +714,7 @@ var _ = Describe("LightrunJavaAgent controller", func() {
 				if err := k8sClient.Get(ctx, lrAgentRequest2, &lrAgent2); err != nil {
 					return false
 				}
-				return lrAgent2.Status.WorkloadStatus == "Ready"
+				return lrAgent2.Status.DeploymentStatus == "Ready"
 			}).Should(BeTrue())
 		})
 
@@ -749,7 +749,7 @@ var _ = Describe("LightrunJavaAgent controller", func() {
 				if err := k8sClient.Get(ctx, lrAgentRequest3, &lrAgent3); err != nil {
 					return false
 				}
-				return lrAgent3.Status.WorkloadStatus == "ReconcileFailed"
+				return lrAgent3.Status.DeploymentStatus == "ReconcileFailed"
 			}).Should(BeTrue())
 		})
 		It("Should not add finalizer to the duplicate CR", func() {
@@ -845,7 +845,7 @@ var _ = Describe("LightrunJavaAgent controller", func() {
 				if err := k8sClient.Get(ctx, lrAgentRequest4, &lrAgent4); err != nil {
 					return false
 				}
-				return lrAgent4.Status.WorkloadStatus == "" && lrAgent4.Status.Conditions == nil
+				return lrAgent4.Status.DeploymentStatus == "" && lrAgent4.Status.Conditions == nil
 			}).Should(BeTrue())
 		})
 		It("Should not patch the deployment", func() {
@@ -1132,7 +1132,7 @@ var _ = Describe("LightrunJavaAgent controller", func() {
 			}, timeout, interval).Should(BeTrue())
 
 			// Also verify the workload status is set correctly
-			Expect(lrAgentResult.Status.WorkloadStatus).To(Equal(reconcileTypeNotProgressing))
+			Expect(lrAgentResult.Status.DeploymentStatus).To(Equal(reconcileTypeNotProgressing))
 		})
 	})