Merge pull request #348 from JamesMcNee/kubernetes-client-620

Upgrade to the latest Kubernetes Client

Author: chadlwilson

build.gradle

@@ -20,7 +20,7 @@ apply from: "https://raw.githubusercontent.com/gocd/gocd-plugin-gradle-task-help
 
 gocdPlugin {
   id = 'cd.go.contrib.elasticagent.kubernetes'
-  pluginVersion = '3.8.4'
+  pluginVersion = '3.9.0'
   goCdVersion = '20.9.0'
   name = 'Kubernetes Elastic Agent Plugin'
   description = 'Kubernetes Based Elastic Agent Plugins for GoCD'
@@ -55,6 +55,7 @@ java {
 ext {
     deps = [
         gocdPluginApi: 'cd.go.plugin:go-plugin-api:23.1.0',
+        kubernetesClientApi: 'io.fabric8:kubernetes-client-api:6.5.1',
     ]
 
     versions = project.ext.deps.collectEntries { lib, libGav -> [lib, libGav.split(':').last()] }
@@ -63,7 +64,8 @@ ext {
 dependencies {
     compileOnly project.deps.gocdPluginApi
     implementation group: 'com.google.code.gson', name: 'gson', version: '2.10.1'
-    implementation group: 'io.fabric8', name: 'kubernetes-client', version: '5.12.4'
+    implementation project.deps.kubernetesClientApi
+    runtimeOnly group: 'io.fabric8', name: 'kubernetes-client', version: project.versions.kubernetesClientApi
     implementation group: 'com.github.spullara.mustache.java', name: 'compiler', version: '0.9.10'
     implementation group: 'org.freemarker', name: 'freemarker', version: '2.3.32'
 

src/main/java/cd/go/contrib/elasticagent/KubernetesClientFactory.java

@@ -17,8 +17,8 @@
 package cd.go.contrib.elasticagent;
 
 import io.fabric8.kubernetes.client.ConfigBuilder;
-import io.fabric8.kubernetes.client.DefaultKubernetesClient;
 import io.fabric8.kubernetes.client.KubernetesClient;
+import io.fabric8.kubernetes.client.KubernetesClientBuilder;
 
 import java.util.concurrent.TimeUnit;
 
@@ -75,12 +75,13 @@ private void clearOutClientOnTimer() {
 
     private KubernetesClient createClientFor(PluginSettings pluginSettings) {
         final ConfigBuilder configBuilder = new ConfigBuilder()
+                .withAutoConfigure(false)
                 .withOauthToken(pluginSettings.getSecurityToken())
                 .withMasterUrl(pluginSettings.getClusterUrl())
                 .withCaCertData(pluginSettings.getCaCertData())
                 .withNamespace(pluginSettings.getNamespace());
 
-        return new DefaultKubernetesClient(configBuilder.build());
+        return new KubernetesClientBuilder().withConfig(configBuilder.build()).build();
     }
 
     public void clearOutExistingClient() {

src/main/java/cd/go/contrib/elasticagent/KubernetesInstanceFactory.java

@@ -148,7 +148,7 @@ private static void setAnnotations(Pod pod, CreateAgentRequest request) {
 
     private KubernetesInstance createKubernetesPod(KubernetesClient client, Pod elasticAgentPod) {
         LOG.info(format("[Create Agent] Creating K8s pod with spec: {0}.", elasticAgentPod.toString()));
-        Pod pod = client.pods().create(elasticAgentPod);
+        Pod pod = client.pods().resource(elasticAgentPod).create();
         return fromKubernetesPod(pod);
     }
 

src/main/java/cd/go/contrib/elasticagent/model/reports/agent/KubernetesPodDetails.java

@@ -9,8 +9,8 @@
 import static java.text.MessageFormat.format;
 
 public class KubernetesPodDetails {
+
     private String name;
-    private String clusterName;
     private String nodeName;
     private String namespace;
     private String createdAt;
@@ -24,7 +24,6 @@ public static KubernetesPodDetails fromPod(Pod pod) {
         KubernetesPodDetails podDetails = new KubernetesPodDetails();
 
         podDetails.name = pod.getMetadata().getName();
-        podDetails.clusterName = pod.getMetadata().getClusterName();
         podDetails.nodeName = pod.getSpec().getNodeName();
         podDetails.namespace = pod.getMetadata().getNamespace();
 
@@ -50,10 +49,6 @@ public String getName() {
         return name;
     }
 
-    public String getClusterName() {
-        return clusterName;
-    }
-
     public String getNodeName() {
         return nodeName;
     }

src/main/resources/agent-status-report.template.ftlh

@@ -355,10 +355,6 @@
                                 <label>Pod name</label>
                                 <span>${ podDetails.name !}</span>
                             </li>
-                            <li class="name-value_pair">
-                                <label>Cluster Name</label>
-                                <span>${ podDetails.clusterName !}</span>
-                            </li>
                             <li class="name-value_pair">
                                 <label>Node Name</label>
                                 <span>${ podDetails.nodeName !}</span>