fix: merge SendPort and ReceivePort into Port (#22)

0x5457 · web-flow · commit ac13b528b8f5 · 2024-12-21T20:52:26.000+08:00
diff --git a/internal/config/config.go b/internal/config/config.go
@@ -15,8 +15,7 @@ type Config struct {
 
 type Worker struct {
 	corev1.PodTemplate
-	SendPort    int16 `json:"sendPort"`
-	ReceivePort int16 `json:"receivePort"`
+	Port    int16 `json:"port"`
 }
 
 type PodMutation struct {
@@ -41,8 +40,7 @@ func LoadConfig(filename string) (*Config, error) {
 func NewDefaultConfig() *Config {
 	return &Config{
 		Worker: Worker{
-			SendPort:    1234,
-			ReceivePort: 4321,
+			Port:    1234,
 			PodTemplate: corev1.PodTemplate{
 				Template: corev1.PodTemplateSpec{
 					Spec: corev1.PodSpec{
diff --git a/internal/worker/worker.go b/internal/worker/worker.go
@@ -15,7 +15,7 @@ type WorkerGenerator struct {
 }
 
 func (wg *WorkerGenerator) GenerateConnectionURL(_gpu *tfv1.GPU, connection *tfv1.TensorFusionConnection, pod *corev1.Pod) string {
-	return fmt.Sprintf("native+%s+%d+%d", pod.Status.PodIP, wg.WorkerConfig.ReceivePort, wg.WorkerConfig.SendPort)
+	return fmt.Sprintf("native+%s+%d", pod.Status.PodIP, wg.WorkerConfig.Port)
 }
 
 func (wg *WorkerGenerator) GenerateWorkerPod(

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ type WorkerGenerator struct {`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`func (wg WorkerGenerator) GenerateConnectionURL(_gpu tfv1.GPU, connection tfv1.TensorFusionConnection, pod corev1.Pod) string {`
`18`		`- return fmt.Sprintf("native+%s+%d+%d", pod.Status.PodIP, wg.WorkerConfig.ReceivePort, wg.WorkerConfig.SendPort)`
	`18`	`+ return fmt.Sprintf("native+%s+%d", pod.Status.PodIP, wg.WorkerConfig.Port)`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`func (wg *WorkerGenerator) GenerateWorkerPod(`