Merge pull request #1056 from renyunkang/agent-info

stoneshi-yunify · web-flow · commit da6bd1d851fc · 2025-04-25T17:59:44.000+08:00
fix: pod name couldn't be empty
diff --git a/controllers/jenkins/pipelinerun/pipelinerun_controller.go b/controllers/jenkins/pipelinerun/pipelinerun_controller.go
@@ -268,15 +268,16 @@ func (r *Reconciler) getAgentInfo(ctx context.Context, pr *v1alpha3.PipelineRun)
 			if strings.HasPrefix(line, "Agent") && strings.Contains(line, "is provisioned from template") {
 				parts := strings.Fields(line)
 				if len(parts) > 2 {
-					pr.Annotations[v1alpha3.JenkinsAgentPodNameAnnoKey] = parts[1]
+					podName = parts[1]
+					pr.Annotations[v1alpha3.JenkinsAgentPodNameAnnoKey] = podName
 					klog.Infof("get agent pod name: %s", parts[1])
 				}
 				break
 			}
 		}
 	}
 
-	if !nodeNameExist {
+	if podName != "" && !nodeNameExist {
 		agentPod := &corev1.Pod{}
 		err := r.Client.Get(ctx, client.ObjectKey{Namespace: r.Options.WorkerNamespace, Name: podName}, agentPod)
 		if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -268,15 +268,16 @@ func (r Reconciler) getAgentInfo(ctx context.Context, pr v1alpha3.PipelineRun)`
`268`	`268`	`if strings.HasPrefix(line, "Agent") && strings.Contains(line, "is provisioned from template") {`
`269`	`269`	`parts := strings.Fields(line)`
`270`	`270`	`if len(parts) > 2 {`
`271`		`- pr.Annotations[v1alpha3.JenkinsAgentPodNameAnnoKey] = parts[1]`
	`271`	`+ podName = parts[1]`
	`272`	`+ pr.Annotations[v1alpha3.JenkinsAgentPodNameAnnoKey] = podName`
`272`	`273`	`klog.Infof("get agent pod name: %s", parts[1])`
`273`	`274`	`}`
`274`	`275`	`break`
`275`	`276`	`}`
`276`	`277`	`}`
`277`	`278`	`}`
`278`	`279`
`279`		`- if !nodeNameExist {`
	`280`	`+ if podName != "" && !nodeNameExist {`
`280`	`281`	`agentPod := &corev1.Pod{}`
`281`	`282`	`err := r.Client.Get(ctx, client.ObjectKey{Namespace: r.Options.WorkerNamespace, Name: podName}, agentPod)`
`282`	`283`	`if err != nil {`