fix: merge conflict

Author: Code2Life

go.mod

@@ -11,6 +11,7 @@ require (
 	github.com/aws/smithy-go v1.22.3
 	github.com/gin-contrib/gzip v1.2.3
 	github.com/gin-gonic/gin v1.10.1
+	github.com/influxdata/line-protocol/v2 v2.2.1
 	github.com/lithammer/shortuuid/v4 v4.2.0
 	github.com/onsi/ginkgo/v2 v2.23.4
 	github.com/onsi/gomega v1.37.0

internal/controller/tensorfusionworkload_controller.go

@@ -269,11 +269,11 @@ func (r *TensorFusionWorkloadReconciler) tryStartWorker(
 	workload *tfv1.TensorFusionWorkload,
 	hash string,
 ) (*corev1.Pod, error) {
-	port, err := r.PortAllocator.AssignHostPort(gpu.Status.NodeSelector[constants.KubernetesHostNameLabel])
+	port, err := r.PortAllocator.AssignHostPort(gpus[0].Status.NodeSelector[constants.KubernetesHostNameLabel])
 	if err != nil {
 		return nil, fmt.Errorf("get host port %w", err)
 	}
-	pod, hash, err := workerGenerator.GenerateWorkerPod(gpu, fmt.Sprintf("%s-tf-worker-", workload.Name), workload.Namespace, port, workload.Spec.Resources.Requests, workload.Spec.Resources.Limits, hash)
+	pod, hash, err := workerGenerator.GenerateWorkerPod(gpus, fmt.Sprintf("%s-tf-worker-", workload.Name), workload.Namespace, port, workload.Spec.Resources.Requests, workload.Spec.Resources.Limits, hash)
 	if err != nil {
 		return nil, fmt.Errorf("generate worker pod %w", err)
 	}

internal/controller/tensorfusionworkload_controller_test.go

@@ -100,7 +100,7 @@ var _ = Describe("TensorFusionWorkload Controller", func() {
 
 				gpuNames := strings.Split(podList.Items[0].Annotations[constants.GpuKey], ",")
 				g.Expect(gpuNames).Should(HaveLen(2))
-			}, timeout, interval).Should(Succeed())
+			}).Should(Succeed())
 
 			checkWorkloadStatus(workload)
 		})

internal/metrics/recorder.go

@@ -75,7 +75,7 @@ func SetWorkerMetricsByWorkload(pod *corev1.Pod, workload *tfv1.TensorFusionWork
 		// handle invalid data if exists
 		metricsItem.GPUCount = 1
 	} else {
-		metricsItem.GPUCount = workload.Spec.GPUCount
+		metricsItem.GPUCount = int(workload.Spec.GPUCount)
 	}
 	metricsItem.WorkloadName = workload.Name