diff --git a/pom.xml b/pom.xml index f7ddf2a..8a55239 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ org.jenkins-ci.plugins plugin - 4.54 + 4.72 @@ -20,14 +20,14 @@ 1.0.0 - 2.361.4 - bom-2.361.x - 1798.vc671fe94856f + 2.401.1 + bom-2.401.x + 2357.v1043f8578392 2.3.0 1.4.0 - 0.10.0 + 0.11 4.3.0 @@ -77,13 +77,13 @@ org.jenkins-ci.plugins authentication-tokens - 1.3 + 1.53.v1c90fd9191a_b_ org.jenkins-ci.plugins kubernetes-client-api - 6.3.1-206.v76d3b_6b_14db_b + 6.8.1-224.vd388fca_4db_3b_ @@ -163,7 +163,7 @@ org.jenkins-ci.plugins docker-commons - 1.18 + 439.va_3cb_0a_6a_fb_29 test 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 index ffb59f2..106ee0d 100644 --- 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 existingOrNewContext(ConfigBuilder configBuilder, - String context) { + private static ConfigFluent.ContextsNested 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 existingOrNewCluster(ConfigBuilder configBuilder, - String cluster) { + private static ConfigFluent.ClustersNested 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/src/test/java/org/jenkinsci/plugins/kubernetes/cli/kubeconfig/KubeConfigWriterBuilderTest.java b/src/test/java/org/jenkinsci/plugins/kubernetes/cli/kubeconfig/KubeConfigWriterBuilderTest.java index d073ec7..ea3a779 100644 --- a/src/test/java/org/jenkinsci/plugins/kubernetes/cli/kubeconfig/KubeConfigWriterBuilderTest.java +++ b/src/test/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