From 68230bfd69b3e36f81904866829f73c9f1e15798 Mon Sep 17 00:00:00 2001
From: Chitsing KUI <kuizhiqing@msn.com>
Date: Fri, 19 May 2023 14:59:04 +0800
Subject: [PATCH] [0.3.5] fix paddle_port bug, release 0.3.5 (#94)

* fix PADDLE_PORT env for ps

* fix port bug, release 0.3.5
---
 Makefile                          | 2 +-
 config/manager/kustomization.yaml | 2 +-
 controllers/paddlejob_helper.go   | 3 ++-
 deploy/v1/operator.yaml           | 2 +-
 deploy/v1beta1/operator.yaml      | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 2cf2b5e..dce6268 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 
 # Image URL to use all building/pushing image targets
-IMG ?= registry.baidubce.com/paddlecloud/controller:v0.3.4
+IMG ?= registry.baidubce.com/paddlecloud/controller:v0.3.5
 # Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
 CRD_OPTIONS ?= "crd:maxDescLen=0,generateEmbeddedObjectMeta=true,trivialVersions=true,preserveUnknownFields=false"
 CRD_OPTIONS_V1BETA1 ?= "crd:crdVersions=v1beta1,allowDangerousTypes=false,maxDescLen=0" 
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
index 448b4eb..7148c49 100644
--- a/config/manager/kustomization.yaml
+++ b/config/manager/kustomization.yaml
@@ -15,4 +15,4 @@ configMapGenerator:
 images:
 - name: controller
   newName: registry.baidubce.com/paddlecloud/controller
-  newTag: v0.3.4
+  newTag: v0.3.5
diff --git a/controllers/paddlejob_helper.go b/controllers/paddlejob_helper.go
index a5bdcce..86205f7 100644
--- a/controllers/paddlejob_helper.go
+++ b/controllers/paddlejob_helper.go
@@ -224,13 +224,13 @@ func constructConfigMap(pdj *pdv1.PaddleJob, childPods corev1.PodList) (cm *core
 		}
 	}
 
+	paddle_port := PADDLE_PORT + rand.Intn(20000)
 	for _, pod := range childPods.Items {
 		if len(strings.Split(pod.Status.PodIP, ".")) != 4 {
 			return nil
 		}
 		resType, idx := extractNameIndex(pod.Name)
 
-		paddle_port := PADDLE_PORT + rand.Intn(20000)
 		if pdj.Spec.Intranet == pdv1.Service {
 			resources[resType][idx] = fmt.Sprintf("%s:%d", pod.Name, PADDLE_PORT)
 		} else {
@@ -249,6 +249,7 @@ func constructConfigMap(pdj *pdv1.PaddleJob, childPods corev1.PodList) (cm *core
 		},
 		Data: map[string]string{
 			"TRAINER_PORTS_NUM": fmt.Sprintf("%d", HOST_PORT_NUM),
+			"PADDLE_PORT":       fmt.Sprintf("%d", paddle_port),
 		},
 	}
 
diff --git a/deploy/v1/operator.yaml b/deploy/v1/operator.yaml
index af43ddc..4ad2fef 100644
--- a/deploy/v1/operator.yaml
+++ b/deploy/v1/operator.yaml
@@ -242,7 +242,7 @@ spec:
         - --leader-elect
         command:
         - /manager
-        image: registry.baidubce.com/paddlecloud/controller:v0.3.4
+        image: registry.baidubce.com/paddlecloud/controller:v0.3.5
         imagePullPolicy: Always
         livenessProbe:
           httpGet:
diff --git a/deploy/v1beta1/operator.yaml b/deploy/v1beta1/operator.yaml
index af43ddc..4ad2fef 100644
--- a/deploy/v1beta1/operator.yaml
+++ b/deploy/v1beta1/operator.yaml
@@ -242,7 +242,7 @@ spec:
         - --leader-elect
         command:
         - /manager
-        image: registry.baidubce.com/paddlecloud/controller:v0.3.4
+        image: registry.baidubce.com/paddlecloud/controller:v0.3.5
         imagePullPolicy: Always
         livenessProbe:
           httpGet: