Merge pull request #378 from jenkinsci/JENKINS-53370

[JENKINS-53370] Check for nulls in older kubernetes versions
jenkinsci · Sep 7, 2018 · eb7427d · eb7427d
2 parents 1ee21e8 + 910a57b
commit eb7427d
Showing 1 changed file with 14 additions and 6 deletions.
diff --git a/src/main/java/org/csanchez/jenkins/plugins/kubernetes/KubernetesCloud.java b/src/main/java/org/csanchez/jenkins/plugins/kubernetes/KubernetesCloud.java
@@ -490,16 +490,24 @@ private boolean addProvisionedSlave(@Nonnull PodTemplate template, @CheckForNull
  }
 
  PodList slaveList = client.pods().inNamespace(templateNamespace).withLabels(getLabels()).list();
- List<Pod> allActiveSlavePods = slaveList.getItems().stream()
- .filter(x -> x.getStatus().getPhase().toLowerCase().matches("(running|pending)"))
- .collect(Collectors.toList());
+ List<Pod> allActiveSlavePods = null;
+ // JENKINS-53370 check for nulls
+ if (slaveList != null && slaveList.getItems() != null) {
+ allActiveSlavePods = slaveList.getItems().stream() //
+ .filter(x -> x.getStatus().getPhase().toLowerCase().matches("(running|pending)"))
+ .collect(Collectors.toList());
+ }
 
  Map<String, String> labelsMap = new HashMap<>(this.getLabels());
  labelsMap.putAll(template.getLabelsMap());
  PodList templateSlaveList = client.pods().inNamespace(templateNamespace).withLabels(labelsMap).list();
- List<Pod> activeTemplateSlavePods = templateSlaveList.getItems().stream()
- .filter(x -> x.getStatus().getPhase().toLowerCase().matches("(running|pending)"))
- .collect(Collectors.toList());
+ // JENKINS-53370 check for nulls
+ List<Pod> activeTemplateSlavePods = null;
+ if (templateSlaveList != null && templateSlaveList.getItems() != null) {
+ activeTemplateSlavePods = templateSlaveList.getItems().stream()
+ .filter(x -> x.getStatus().getPhase().toLowerCase().matches("(running|pending)"))
+ .collect(Collectors.toList());
+ }
 
  if (allActiveSlavePods != null && containerCap <= allActiveSlavePods.size()) {
  LOGGER.log(Level.INFO,