DEVOPS-2689-extend-k-8-s-operator-support-to-include-stateful-sets

api/v1beta/lightrunjavaagent_types.go

@@ -97,11 +97,13 @@ type LightrunJavaAgentStatus struct {
 	LastScheduleTime *metav1.Time       `json:"lastScheduleTime,omitempty"`
 	Conditions       []metav1.Condition `json:"conditions,omitempty"`
 	WorkloadStatus   string             `json:"workloadStatus,omitempty"`
+	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=Workload,type=string,JSONPath=".spec.workloadName",description="Workload name",format=""
 //+kubebuilder:printcolumn:priority=0,name=Type,type=string,JSONPath=".spec.workloadType",description="Workload type",format=""
 //+kubebuilder:printcolumn:priority=0,name="Status",type=string,JSONPath=".status.workloadStatus",description="Status of Workload Reconciliation",format=""

charts/lightrun-operator/crds/lightrunjavaagent_crd.yaml

@@ -16,6 +16,10 @@ spec:
   scope: Namespaced
   versions:
   - additionalPrinterColumns:
+    - description: Deployment name
+      jsonPath: .spec.deploymentName
+      name: Deployment
+      type: string
     - description: Workload name
       jsonPath: .spec.workloadName
       name: Workload
@@ -210,6 +214,8 @@ spec:
                   - type
                   type: object
                 type: array
+              deploymentStatus:
+                type: string
               lastScheduleTime:
                 format: date-time
                 type: string

config/crd/bases/agents.lightrun.com_lightrunjavaagents.yaml

@@ -17,6 +17,10 @@ spec:
   scope: Namespaced
   versions:
   - additionalPrinterColumns:
+    - description: Deployment name
+      jsonPath: .spec.deploymentName
+      name: Deployment
+      type: string
     - description: Workload name
       jsonPath: .spec.workloadName
       name: Workload
@@ -211,6 +215,8 @@ spec:
                   - type
                   type: object
                 type: array
+              deploymentStatus:
+                type: string
               lastScheduleTime:
                 format: date-time
                 type: string

config/samples/operator.yaml

@@ -28,6 +28,10 @@ spec:
   scope: Namespaced
   versions:
   - additionalPrinterColumns:
+    - description: Deployment name
+      jsonPath: .spec.deploymentName
+      name: Deployment
+      type: string
     - description: Workload name
       jsonPath: .spec.workloadName
       name: Workload
@@ -222,6 +226,8 @@ spec:
                   - type
                   type: object
                 type: array
+              deploymentStatus:
+                type: string
               lastScheduleTime:
                 format: date-time
                 type: string

examples/operator.yaml

@@ -18,6 +18,10 @@ spec:
   scope: Namespaced
   versions:
   - additionalPrinterColumns:
+    - description: Deployment name
+      jsonPath: .spec.deploymentName
+      name: Deployment
+      type: string
     - description: Workload name
       jsonPath: .spec.workloadName
       name: Workload
@@ -212,6 +216,8 @@ spec:
                   - type
                   type: object
                 type: array
+              deploymentStatus:
+                type: string
               lastScheduleTime:
                 format: date-time
                 type: string

internal/controller/helpers.go

@@ -130,6 +130,7 @@ func (r *LightrunJavaAgentReconciler) successStatus(ctx context.Context, instanc
 	}
 	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) {
@@ -156,6 +157,7 @@ func (r *LightrunJavaAgentReconciler) errorStatus(ctx context.Context, instance
 	}
 	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.go

@@ -86,31 +86,30 @@ func (r *LightrunJavaAgentReconciler) Reconcile(ctx context.Context, req ctrl.Re
 
 func (r *LightrunJavaAgentReconciler) determineWorkloadType(lightrunJavaAgent *agentv1beta.LightrunJavaAgent) (agentv1beta.WorkloadType, error) {
 	spec := lightrunJavaAgent.Spec
+	// Check which configuration approach is being used
+	var isDeploymentConfigured bool = spec.DeploymentName != ""
+	var isWorkloadConfigured bool = spec.WorkloadName != "" || spec.WorkloadType != ""
 
 	// === Case 1: Legacy only — DeploymentName only ===
-	if spec.DeploymentName != "" && spec.WorkloadName == "" && spec.WorkloadType == "" {
+	if isDeploymentConfigured && !isWorkloadConfigured {
+		r.Log.Info("Using deprecated field deploymentName, consider migrating to workloadName and workloadType")
 		return agentv1beta.WorkloadTypeDeployment, nil
 	}
 
 	// === Case 2: New fields — WorkloadName + WorkloadType ===
-	if spec.DeploymentName == "" && spec.WorkloadName != "" {
+	if !isDeploymentConfigured && isWorkloadConfigured {
 		if spec.WorkloadType == "" {
-			return "", errors.New("WorkloadType must be set when using WorkloadName")
+			return "", errors.New("workloadType must be set when using workloadName")
+		}
+		if spec.WorkloadName == "" {
+			return "", errors.New("workloadName must be set when workloadType is specified")
 		}
 		return spec.WorkloadType, nil
 	}
 
-	// === Case 3: Misconfigured — Both names are set ===
-	if spec.DeploymentName != "" && spec.WorkloadName != "" {
-		// Same names still ambiguous — rely on workloadType
-		if spec.DeploymentName == spec.WorkloadName {
-			if spec.WorkloadType == "" {
-				return "", errors.New("both DeploymentName and WorkloadName are set and equal; please remove DeploymentName and set workloadType explicitly")
-			}
-			return spec.WorkloadType, nil
-		}
-		// Names differ — reject as invalid
-		return "", errors.New("DeploymentName and WorkloadName are both set but differ; please use only WorkloadName with WorkloadType")
+	// === Case 3: Misconfigured — Both fields exists or both are empty ===
+	if isDeploymentConfigured && isWorkloadConfigured {
+		return "", errors.New("invalid configuration: use either deploymentName (legacy) OR workloadName with workloadType, not both")
 	}
 
 	// === Case 4: Fully empty or malformed ===
@@ -126,7 +125,9 @@ func (r *LightrunJavaAgentReconciler) reconcileDeployment(ctx context.Context, l
 		// Fall back to legacy field if WorkloadName isn't set
 		deploymentName = lightrunJavaAgent.Spec.DeploymentName
 	}
-
+	if deploymentName == "" {
+		return r.errorStatus(ctx, lightrunJavaAgent, errors.New("unable to reconcile deployment: missing workloadName or deploymentName(legacy and deprecated)"))
+	}
 	log := r.Log.WithValues("lightrunJavaAgent", lightrunJavaAgent.Name, "deployment", deploymentName)
 	fieldManager := "lightrun-conrtoller"
 
@@ -357,7 +358,10 @@ func (r *LightrunJavaAgentReconciler) reconcileDeployment(ctx context.Context, l
 func (r *LightrunJavaAgentReconciler) reconcileStatefulSet(ctx context.Context, lightrunJavaAgent *agentv1beta.LightrunJavaAgent, namespace string) (ctrl.Result, error) {
 	log := r.Log.WithValues("lightrunJavaAgent", lightrunJavaAgent.Name, "statefulSet", lightrunJavaAgent.Spec.WorkloadName)
 	fieldManager := "lightrun-controller"
-
+	statefulSetName := lightrunJavaAgent.Spec.WorkloadName
+	if statefulSetName == "" {
+		return r.errorStatus(ctx, lightrunJavaAgent, errors.New("unable to reconcile statefulset: missing workloadName field"))
+	}
 	stsNamespacedObj := client.ObjectKey{
 		Name:      lightrunJavaAgent.Spec.WorkloadName,
 		Namespace: namespace,