Merge pull request #1306 from Vlatombe/update-kubernetes-client-api-6.4.x

Upgrade kubernetes-client-api to 6.4.x line

Author: Vlatombe

pom.xml

@@ -56,7 +56,7 @@
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>kubernetes-client-api</artifactId>
-      <version>6.3.1-206.v76d3b_6b_14db_b</version>
+      <version>6.4.1-208.vfe09a_9362c2c</version>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>

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

@@ -157,10 +157,7 @@ public KubernetesClient createClient() throws KubernetesAuthException {
                 }
             }
         }
-        // TODO post 2.362 use jenkins.util.SetContextClassLoader
-        try (WithContextClassLoader ignored = new WithContextClassLoader(getClass().getClassLoader())) {
-            return new KubernetesClientBuilder().withConfig(builder.build()).build();
-        }
+        return new KubernetesClientBuilder().withConfig(builder.build()).build();
     }
 
     /**

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

@@ -599,16 +599,15 @@ public static String substitute(String s, Map<String, String> properties, String
 
     public static Pod parseFromYaml(String yaml) {
         String s = yaml;
-        try (WithContextClassLoader ignored = new WithContextClassLoader(PodTemplateUtils.class.getClassLoader());
-             KubernetesClient client = new KubernetesClientBuilder().build()) {
+        try (KubernetesClient client = new KubernetesClientBuilder().build()) {
             // JENKINS-57116
             if (StringUtils.isBlank(s)) {
                 LOGGER.log(Level.WARNING, "[JENKINS-57116] Trying to parse invalid yaml: \"{0}\"", yaml);
                 s = "{}";
             }
             Pod podFromYaml;
             try (InputStream is = new ByteArrayInputStream(s.getBytes(UTF_8))) {
-                podFromYaml = client.pods().load(is).get();
+                podFromYaml = client.pods().load(is).item();
             } catch (IOException | KubernetesClientException e) {
                 throw new RuntimeException(String.format("Failed to parse yaml: \"%s\"", yaml), e);
             }