Merge pull request #1291 from Vlatombe/kubernetes-client-one-more-followup

Author: Vlatombe

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

@@ -188,18 +188,4 @@ private static StandardCredentials resolveCredentials(@CheckForNull String crede
         return c;
     }
 
-    private static class WithContextClassLoader implements AutoCloseable {
-
-        private final ClassLoader previousClassLoader;
-
-        public WithContextClassLoader(ClassLoader classLoader) {
-            this.previousClassLoader = Thread.currentThread().getContextClassLoader();
-            Thread.currentThread().setContextClassLoader(classLoader);
-        }
-
-        @Override
-        public void close() {
-            Thread.currentThread().setContextClassLoader(previousClassLoader);
-        }
-    }
 }

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

@@ -54,8 +54,8 @@
 import io.fabric8.kubernetes.api.model.Toleration;
 import io.fabric8.kubernetes.api.model.Volume;
 import io.fabric8.kubernetes.api.model.VolumeMount;
-import io.fabric8.kubernetes.client.DefaultKubernetesClient;
 import io.fabric8.kubernetes.client.KubernetesClient;
+import io.fabric8.kubernetes.client.KubernetesClientBuilder;
 import io.fabric8.kubernetes.client.KubernetesClientException;
 
 import static hudson.Util.replaceMacro;
@@ -599,7 +599,8 @@ public static String substitute(String s, Map<String, String> properties, String
 
     public static Pod parseFromYaml(String yaml) {
         String s = yaml;
-        try (KubernetesClient client = new DefaultKubernetesClient()) {
+        try (WithContextClassLoader ignored = new WithContextClassLoader(PodTemplateUtils.class.getClassLoader());
+             KubernetesClient client = new KubernetesClientBuilder().build()) {
             // JENKINS-57116
             if (StringUtils.isBlank(s)) {
                 LOGGER.log(Level.WARNING, "[JENKINS-57116] Trying to parse invalid yaml: \"{0}\"", yaml);

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

@@ -0,0 +1,17 @@
+package org.csanchez.jenkins.plugins.kubernetes;
+
+// TODO post 2.362 use jenkins.util.SetContextClassLoader
+class WithContextClassLoader implements AutoCloseable {
+
+    private final ClassLoader previousClassLoader;
+
+    public WithContextClassLoader(ClassLoader classLoader) {
+        this.previousClassLoader = Thread.currentThread().getContextClassLoader();
+        Thread.currentThread().setContextClassLoader(classLoader);
+    }
+
+    @Override
+    public void close() {
+        Thread.currentThread().setContextClassLoader(previousClassLoader);
+    }
+}

src/test/java/org/csanchez/jenkins/plugins/kubernetes/KubernetesTestUtil.java

@@ -160,7 +160,7 @@ public static void assumeWindows(String buildNumber) {
     }
 
     public static boolean isWindows(@CheckForNull String buildNumber) {
-        try (KubernetesClient client = new DefaultKubernetesClient(new ConfigBuilder(Config.autoConfigure(null)).build())) {
+        try (KubernetesClient client = new KubernetesClientBuilder().build()) {
             for (Node n : client.nodes().list().getItems()) {
                 Map<String, String> labels = n.getMetadata().getLabels();
                 String os = labels.get("kubernetes.io/os");