Skip to content

Commit 4ee1053

Browse files
committed
Pass reference to cloud and job for better cause of blockage
1 parent 91bc45d commit 4ee1053

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

src/main/java/org/csanchez/jenkins/plugins/kubernetes/KubernetesQueueTaskDispatcher.java

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,25 @@ public CauseOfBlockage canTake(Node node, Queue.BuildableItem item) {
1919
KubernetesSlave slave = (KubernetesSlave) node;
2020
Task ownerTask = item.task.getOwnerTask();
2121
if (!KubernetesFolderProperty.isAllowed(slave, (Job) ownerTask)) {
22-
return new KubernetesCloudNotAllowed();
22+
return new KubernetesCloudNotAllowed(slave.getKubernetesCloud(), (Job) ownerTask);
2323
}
2424
}
2525
return null;
2626
}
2727

2828
public static final class KubernetesCloudNotAllowed extends CauseOfBlockage {
29+
30+
private final KubernetesCloud cloud;
31+
private final Job job;
32+
33+
public KubernetesCloudNotAllowed(KubernetesCloud cloud, Job job) {
34+
this.cloud = cloud;
35+
this.job = job;
36+
}
37+
2938
@Override
3039
public String getShortDescription() {
31-
return Messages.KubernetesCloudNotAllowed_Description();
40+
return Messages.KubernetesCloudNotAllowed_Description(cloud.name, job.getFullName());
3241
}
3342
}
3443
}

src/main/resources/org/csanchez/jenkins/plugins/kubernetes/Messages.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ KubernetesSlave.HomeWarning=[WARNING] HOME is set to / in the jnlp container. Yo
88
troubles when using tools or ssh client. This usually happens if the uid doesn't have any \
99
entry in /etc/passwd. Please add a user to your Dockerfile or set the HOME environment \
1010
variable to a valid directory in the pod template definition.
11-
KubernetesCloudNotAllowed.Description=Kubernetes cloud is not allowed for folder
11+
KubernetesCloudNotAllowed.Description=Kubernetes cloud {0} is not allowed for folder containing job {1}

0 commit comments

Comments
 (0)