Merge a8d7fe0 into f7b7416

jenkinsci · Jan 12, 2020 · 5f97812 · 5f97812
2 parents f7b7416 + a8d7fe0
commit 5f97812
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 6 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/kubernetes/auth/KubernetesAuth.java b/src/main/java/org/jenkinsci/plugins/kubernetes/auth/KubernetesAuth.java
@@ -23,4 +23,5 @@ public interface KubernetesAuth {
      * @throws KubernetesAuthException if something fails while dealing with credentials
      */
     String buildKubeConfig(KubernetesAuthConfig config) throws JsonProcessingException, KubernetesAuthException;
+    io.fabric8.kubernetes.api.model.ConfigBuilder buildConfigBuilder(KubernetesAuthConfig config,String context,String clusterName,String username) throws KubernetesAuthException;
 }
diff --git a/src/main/java/org/jenkinsci/plugins/kubernetes/auth/impl/AbstractKubernetesAuth.java b/src/main/java/org/jenkinsci/plugins/kubernetes/auth/impl/AbstractKubernetesAuth.java
@@ -13,6 +13,11 @@ abstract class AbstractKubernetesAuth implements KubernetesAuth {
     abstract AuthInfoBuilder decorate(AuthInfoBuilder builder, KubernetesAuthConfig config) throws KubernetesAuthException;
 
     public String buildKubeConfig(KubernetesAuthConfig config) throws JsonProcessingException, KubernetesAuthException {
+        io.fabric8.kubernetes.api.model.ConfigBuilder configBuilder = buildConfigBuilder(config, "k8s", "k8s", "cluster-admin");
+        return SerializationUtils.getMapper().writeValueAsString(configBuilder.build());
+    }
+
+    public io.fabric8.kubernetes.api.model.ConfigBuilder buildConfigBuilder(KubernetesAuthConfig config, String context, String clusterName, String username) throws KubernetesAuthException {
         io.fabric8.kubernetes.api.model.ConfigBuilder configBuilder = new io.fabric8.kubernetes.api.model.ConfigBuilder();
         // setup cluster
         Cluster cluster = new Cluster();
@@ -24,26 +29,26 @@ public String buildKubeConfig(KubernetesAuthConfig config) throws JsonProcessing
         cluster.setInsecureSkipTlsVerify(config.isSkipTlsVerify());
         configBuilder
                 .addNewCluster()
-                    .withName("k8s")
+                    .withName(clusterName)
                     .withCluster(cluster)
                 .endCluster();
 
         // setup user (class-specific)
         configBuilder
                 .addNewUser()
-                .withName("cluster-admin")
+                .withName(username)
                     .withUser(decorate(new AuthInfoBuilder(), config).build())
                 .endUser();
         // setup context
         configBuilder
                 .addNewContext()
-                    .withName("k8s")
+                    .withName(context)
                     .withNewContext()
-                        .withCluster("k8s")
-                        .withUser("cluster-admin")
+                        .withCluster(clusterName)
+                        .withUser(username)
                     .endContext()
                 .endContext();
-        return SerializationUtils.getMapper().writeValueAsString(configBuilder.build());
+        return configBuilder;
     }
 
 }
diff --git a/src/main/java/org/jenkinsci/plugins/kubernetes/auth/impl/KubernetesAuthKubeconfig.java b/src/main/java/org/jenkinsci/plugins/kubernetes/auth/impl/KubernetesAuthKubeconfig.java
@@ -1,6 +1,7 @@
 package org.jenkinsci.plugins.kubernetes.auth.impl;
 
 import io.fabric8.kubernetes.client.ConfigBuilder;
+import io.fabric8.kubernetes.client.internal.KubeConfigUtils;
 import org.jenkinsci.plugins.kubernetes.auth.KubernetesAuth;
 import org.jenkinsci.plugins.kubernetes.auth.KubernetesAuthConfig;
 import org.jenkinsci.plugins.kubernetes.auth.KubernetesAuthException;
@@ -31,6 +32,15 @@ public ConfigBuilder decorate(ConfigBuilder builder, KubernetesAuthConfig config
         }
     }
 
+    public io.fabric8.kubernetes.api.model.ConfigBuilder buildConfigBuilder(KubernetesAuthConfig config, String context, String clusterName, String username) throws KubernetesAuthException {
+        try {
+            io.fabric8.kubernetes.api.model.Config kubeConfig = KubeConfigUtils.parseConfigFromString(getKubeconfig());
+            return new io.fabric8.kubernetes.api.model.ConfigBuilder(kubeConfig);
+        } catch (IOException e) {
+            throw new KubernetesAuthException(e.getMessage(), e);
+        }
+    }
+
     public String getKubeconfig() {
         return kubeconfig;
     }