Rebase and resolve conflict with main and update-lmevaljob-pod branches

Signed-off-by: ted chang <[email protected]>

Author: tedhtchang

controllers/job_mgr/README.md

@@ -129,6 +129,8 @@ When Job Manager is an enabled service LMevalJob requires `kueue.x-k8s.io/queue-
     ```
     Start the controller locally:
     ```bash
+    # This file is needed to run controller outside of container
+    echo -n "default">/var/run/secrets/kubernetes.io/serviceaccount/namespace
     ENABLED_SERVICES=LMES,JOB_MGR make run
     ```
     Verify logs

controllers/lmes/lmevaljob_controller_test.go

@@ -1050,7 +1050,7 @@ func Test_ManagedPVC(t *testing.T) {
 		},
 	}
 
-	newPod := createPod(svcOpts, job, log)
+	newPod := CreatePod(svcOpts, job, log)
 
 	assert.Equal(t, expect, newPod)
 }
@@ -1166,7 +1166,7 @@ func Test_ExistingPVC(t *testing.T) {
 		},
 	}
 
-	newPod := createPod(svcOpts, job, log)
+	newPod := CreatePod(svcOpts, job, log)
 
 	assert.Equal(t, expect, newPod)
 }
@@ -1305,7 +1305,7 @@ func Test_PVCPreference(t *testing.T) {
 		},
 	}
 
-	newPod := createPod(svcOpts, job, log)
+	newPod := CreatePod(svcOpts, job, log)
 
 	assert.Equal(t, expect, newPod)
 }
@@ -1480,7 +1480,7 @@ func Test_OfflineMode(t *testing.T) {
 		},
 	}
 
-	newPod := createPod(svcOpts, job, log)
+	newPod := CreatePod(svcOpts, job, log)
 
 	assert.Equal(t, expect, newPod)
 }
@@ -1644,7 +1644,7 @@ func Test_OfflineModeWithOutput(t *testing.T) {
 		},
 	}
 
-	newPod := createPod(svcOpts, job, log)
+	newPod := CreatePod(svcOpts, job, log)
 
 	assert.Equal(t, expect, newPod)
 }

controllers/lmes/storage.go

@@ -30,7 +30,7 @@ func generateMagedPVCResource(job *lmesv1alpha1.LMEvalJob) *corev1.PersistentVol
 			AccessModes: []corev1.PersistentVolumeAccessMode{
 				corev1.ReadWriteOnce,
 			},
-			Resources: corev1.ResourceRequirements{
+			Resources: corev1.VolumeResourceRequirements{
 				Requests: corev1.ResourceList{
 					corev1.ResourceStorage: resource.MustParse(job.Spec.Outputs.PersistentVolumeClaimManaged.Size),
 				},

controllers/tas/statuses_test.go

@@ -6,6 +6,7 @@ import (
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+	routev1 "github.com/openshift/api/route/v1"
 	trustyaiopendatahubiov1alpha1 "github.com/trustyai-explainability/trustyai-service-operator/api/tas/v1alpha1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
@@ -51,7 +52,10 @@ func setupAndTestStatusNoComponent(instance *trustyaiopendatahubiov1alpha1.Trust
 var _ = Describe("Status and condition tests", func() {
 
 	BeforeEach(func() {
-		k8sClient = fake.NewClientBuilder().WithScheme(scheme.Scheme).Build()
+		k8sClient = fake.NewClientBuilder().WithScheme(scheme.Scheme).WithStatusSubresource(
+			&routev1.Route{},
+			&trustyaiopendatahubiov1alpha1.TrustyAIService{},
+		).Build()
 		recorder = record.NewFakeRecorder(10)
 		reconciler = &TrustyAIServiceReconciler{
 			Client:        k8sClient,