Update kubernetes dependencies

* kubernetes-client-api 6.8.1 * raise jenkins requirement to 2.401.1 * compatibility fixes
jenkinsci · Aug 29, 2023 · db2b664 · db2b664
1 parent 8c94294
commit db2b664
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 21 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>4.54</version>
+    <version>4.72</version>
     <relativePath />
   </parent>
 
@@ -20,14 +20,14 @@
     <hpi.compatibleSinceVersion>1.0.0</hpi.compatibleSinceVersion>
 
     <!-- dependency versions -->
-    <jenkins.version>2.361.4</jenkins.version>
-    <bom.artifactId>bom-2.361.x</bom.artifactId>
-    <bom.version>1798.vc671fe94856f</bom.version>
+    <jenkins.version>2.401.1</jenkins.version>
+    <bom.artifactId>bom-2.401.x</bom.artifactId>
+    <bom.version>2357.v1043f8578392</bom.version>
 
     <!-- jenkins plugins versions -->
     <jenkins-env-inject.version>2.3.0</jenkins-env-inject.version>
     <jenkins-declarative.version>1.4.0</jenkins-declarative.version>
-    <jenkins-kubernetes-credentials.version>0.10.0</jenkins-kubernetes-credentials.version>
+    <jenkins-kubernetes-credentials.version>0.11</jenkins-kubernetes-credentials.version>
 
     <!-- maven plugins versions -->
     <maven-coveralls.version>4.3.0</maven-coveralls.version>
@@ -77,13 +77,13 @@
        <dependency>
          <groupId>org.jenkins-ci.plugins</groupId>
          <artifactId>authentication-tokens</artifactId>
-         <version>1.3</version>
+         <version>1.53.v1c90fd9191a_b_</version>
        </dependency>
       <!-- required to enforce dependency version -->
       <dependency>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>kubernetes-client-api</artifactId>
-        <version>6.3.1-206.v76d3b_6b_14db_b</version>
+        <version>6.8.1-224.vd388fca_4db_3b_</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
@@ -163,7 +163,7 @@
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>docker-commons</artifactId>
-      <version>1.18</version>
+      <version>439.va_3cb_0a_6a_fb_29</version>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/src/main/java/org/jenkinsci/plugins/kubernetes/cli/kubeconfig/KubeConfigWriter.java b/src/main/java/org/jenkinsci/plugins/kubernetes/cli/kubeconfig/KubeConfigWriter.java
@@ -84,8 +84,8 @@ private static ConfigBuilder setCurrentContext(ConfigBuilder configBuilder, Stri
         return configBuilder.withCurrentContext(context);
     }
 
-    private static ConfigFluent.ContextsNested<ConfigBuilder> existingOrNewContext(ConfigBuilder configBuilder,
-            String context) {
+    private static ConfigFluent<ConfigBuilder>.ContextsNested<ConfigBuilder> existingOrNewContext(ConfigBuilder configBuilder,
+                                                                                                  String context) {
         if (hasContext(configBuilder, context)) {
             return configBuilder.editMatchingContext(p -> context.equals(p.getName()));
         } else {
@@ -97,8 +97,8 @@ private static boolean hasContext(ConfigBuilder configBuilder, String context) {
         return configBuilder.hasMatchingContext(p -> context.equals(p.getName()));
     }
 
-    private static ConfigFluent.ClustersNested<ConfigBuilder> existingOrNewCluster(ConfigBuilder configBuilder,
-            String cluster) {
+    private static ConfigFluent<ConfigBuilder>.ClustersNested<ConfigBuilder> existingOrNewCluster(ConfigBuilder configBuilder,
+                                                                                                  String cluster) {
         if (configBuilder.hasMatchingCluster(p -> cluster.equals(p.getName()))) {
             return configBuilder.editMatchingCluster(p -> cluster.equals(p.getName()));
         } else {

diff --git a/...est/java/org/jenkinsci/plugins/kubernetes/cli/kubeconfig/KubeConfigWriterBuilderTest.java b/...est/java/org/jenkinsci/plugins/kubernetes/cli/kubeconfig/KubeConfigWriterBuilderTest.java
@@ -98,12 +98,10 @@ public void inClusterServiceAccountToken() throws Exception {
         String configDumpContent = dumpBuilder(configBuilder);
 
         assertEquals("---\n" +
-                "clusters: []\n" +
                 "contexts:\n" +
                 "- context: {}\n" +
                 "  name: \"k8s\"\n" +
-                "current-context: \"k8s\"\n" +
-                "users: []\n", configDumpContent);
+                "current-context: \"k8s\"\n", configDumpContent);
     }
 
     @Test
@@ -122,13 +120,11 @@ public void inClusterServiceAccountTokenWithNamespace() throws Exception {
         String configDumpContent = dumpBuilder(configBuilder);
 
         assertEquals("---\n" +
-                "clusters: []\n" +
                 "contexts:\n" +
                 "- context:\n" +
                 "    namespace: \"test-namespace\"\n" +
                 "  name: \"k8s\"\n" +
-                "current-context: \"k8s\"\n" +
-                "users: []\n", configDumpContent);
+                "current-context: \"k8s\"\n", configDumpContent);
     }
 
     @Test
@@ -147,13 +143,11 @@ public void inClusterServiceAccountTokeninClusterServiceAccountTokenWithContextA
         String configDumpContent = dumpBuilder(configBuilder);
 
         assertEquals("---\n" +
-                "clusters: []\n" +
                 "contexts:\n" +
                 "- context:\n" +
                 "    namespace: \"test-namespace\"\n" +
                 "  name: \"test-context\"\n" +
-                "current-context: \"test-context\"\n" +
-                "users: []\n", configDumpContent);
+                "current-context: \"test-context\"\n", configDumpContent);
     }
 
     @Test