Merge pull request #304 from sky-uk/fix-slave-provisioning-logs

Use slave template namespace in logs
jenkinsci · Apr 6, 2018 · 97f1697 · 97f1697
2 parents 4537610 + 9a8b391
commit 97f1697
Showing 1 changed file with 2 additions and 2 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
@@ -435,15 +435,15 @@ private boolean addProvisionedSlave(@Nonnull PodTemplate template, @CheckForNull
         if (slaveListItems != null && containerCap <= slaveListItems.size()) {
             LOGGER.log(Level.INFO,
                     "Total container cap of {0} reached, not provisioning: {1} running or errored in namespace {2} with Kubernetes labels {3}",
-                    new Object[] { containerCap, slaveListItems.size(), client.getNamespace(), getLabels() });
+                    new Object[] { containerCap, slaveListItems.size(), templateNamespace, getLabels() });
             return false;
         }
 
         if (namedListItems != null && slaveListItems != null && template.getInstanceCap() <= namedListItems.size()) {
             LOGGER.log(Level.INFO,
                     "Template instance cap of {0} reached for template {1}, not provisioning: {2} running or errored in namespace {3} with label \"{4}\" and Kubernetes labels {5}",
                     new Object[] { template.getInstanceCap(), template.getName(), slaveListItems.size(),
-                            client.getNamespace(), label == null ? "" : label.toString(), labelsMap });
+                            templateNamespace, label == null ? "" : label.toString(), labelsMap });
             return false; // maxed out
         }
         return true;