Build kubernetes client config with namespace configured in plugin settings

bdpiprava · bdpiprava · commit 007dfd93fe64 · 2018-02-20T10:16:58.000+05:30
diff --git a/src/main/java/cd/go/contrib/elasticagent/Constants.java b/src/main/java/cd/go/contrib/elasticagent/Constants.java
@@ -48,7 +48,6 @@ public interface Constants {
     String JOB_ID_LABEL_KEY = "Elastic-Agent-Job-Id";
     String JOB_IDENTIFIER_LABEL_KEY = "Elastic-Agent-Job-Identifier";
 
-    String KUBERNETES_NAMESPACE = "default";
     String KUBERNETES_POD_KIND_LABEL_KEY = "kind";
     String KUBERNETES_POD_KIND_LABEL_VALUE = "kubernetes-elastic-agent";
     String KUBERNETES_POD_NAME_PREFIX = "k8s-ea";
diff --git a/src/main/java/cd/go/contrib/elasticagent/KubernetesAgentInstances.java b/src/main/java/cd/go/contrib/elasticagent/KubernetesAgentInstances.java
@@ -151,7 +151,7 @@ public Agents instancesCreatedAfterTimeout(PluginSettings settings, Agents agent
     public void refreshAll(PluginRequest pluginRequest) {
         LOG.debug("[Refresh Instances]. Syncing k8s elastic agent pod information.");
         KubernetesClient client = factory.client(pluginRequest.getPluginSettings());
-        PodList list = client.pods().inNamespace(Constants.KUBERNETES_NAMESPACE).list();
+        PodList list = client.pods().list();
 
         for (Pod pod : list.getItems()) {
             Map<String, String> podLabels = pod.getMetadata().getLabels();
@@ -181,7 +181,7 @@ private KubernetesAgentInstances unregisteredAfterTimeout(PluginSettings setting
             if (knownAgents.containsAgentWithId(instanceName)) {
                 continue;
             }
-            Pod pod = client.pods().inNamespace(Constants.KUBERNETES_NAMESPACE).withName(instanceName).get();
+            Pod pod = client.pods().withName(instanceName).get();
             Date createdAt = getSimpleDateFormat().parse(pod.getMetadata().getCreationTimestamp());
             DateTime dateTimeCreated = new DateTime(createdAt);
 
diff --git a/src/main/java/cd/go/contrib/elasticagent/KubernetesClientFactory.java b/src/main/java/cd/go/contrib/elasticagent/KubernetesClientFactory.java
@@ -49,9 +49,9 @@ private KubernetesClient createClientFor(PluginSettings pluginSettings) {
         final ConfigBuilder configBuilder = new ConfigBuilder()
                 .withOauthToken(pluginSettings.getOauthToken())
                 .withMasterUrl(pluginSettings.getClusterUrl())
-                .withCaCertData(pluginSettings.getCaCertData());
+                .withCaCertData(pluginSettings.getCaCertData())
+                .withNamespace(pluginSettings.getNamespace());
 
-        return new DefaultKubernetesClient(configBuilder.build())
-                .inNamespace(pluginSettings.getNamespace());
+        return new DefaultKubernetesClient(configBuilder.build());
     }
 }
diff --git a/src/main/java/cd/go/contrib/elasticagent/KubernetesInstance.java b/src/main/java/cd/go/contrib/elasticagent/KubernetesInstance.java
@@ -40,7 +40,7 @@ public KubernetesInstance(DateTime createdAt, String environment, String name, M
     }
 
     public void terminate(KubernetesClient client) {
-        client.pods().inNamespace(Constants.KUBERNETES_NAMESPACE).withName(name).delete();
+        client.pods().withName(name).delete();
     }
 
     public String name() {
diff --git a/src/main/java/cd/go/contrib/elasticagent/KubernetesInstanceFactory.java b/src/main/java/cd/go/contrib/elasticagent/KubernetesInstanceFactory.java
@@ -131,7 +131,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().inNamespace(KUBERNETES_NAMESPACE).create(elasticAgentPod);
+        Pod pod = client.pods().create(elasticAgentPod);
         return fromKubernetesPod(pod);
     }
 
diff --git a/src/main/java/cd/go/contrib/elasticagent/executors/AgentStatusReportExecutor.java b/src/main/java/cd/go/contrib/elasticagent/executors/AgentStatusReportExecutor.java
@@ -67,7 +67,7 @@ public GoPluginApiResponse execute() {
 
     private Pod findPodUsingJobIdentifier(JobIdentifier jobIdentifier, KubernetesClient client) {
         try {
-            return client.pods().inNamespace(Constants.KUBERNETES_NAMESPACE)
+            return client.pods()
                     .withLabel(Constants.JOB_ID_LABEL_KEY, String.valueOf(jobIdentifier.getJobId()))
                     .list().getItems().get(0);
         } catch (Exception e) {
@@ -76,7 +76,7 @@ private Pod findPodUsingJobIdentifier(JobIdentifier jobIdentifier, KubernetesCli
     }
 
     private Pod findPodUsingElasticAgentId(String elasticAgentId, KubernetesClient client) {
-        List<Pod> pods = client.pods().inNamespace(Constants.KUBERNETES_NAMESPACE).list().getItems();
+        List<Pod> pods = client.pods().list().getItems();
         for (Pod pod : pods) {
             if (pod.getMetadata().getName().equals(elasticAgentId)) {
                 return pod;
diff --git a/src/main/java/cd/go/contrib/elasticagent/model/KubernetesCluster.java b/src/main/java/cd/go/contrib/elasticagent/model/KubernetesCluster.java
@@ -42,7 +42,7 @@ public KubernetesCluster(KubernetesClient client) throws ParseException {
     private void fetchPods(KubernetesClient dockerClient) throws ParseException {
         final Map<String, KubernetesNode> dockerNodeMap = nodes.stream().distinct().collect(toMap(KubernetesNode::getName, node -> node));
 
-        final List<Pod> pods = dockerClient.pods().inNamespace(Constants.KUBERNETES_NAMESPACE)
+        final List<Pod> pods = dockerClient.pods()
                 .withLabel(Constants.CREATED_BY_LABEL_KEY, Constants.PLUGIN_ID)
                 .list().getItems();
 
diff --git a/src/main/java/cd/go/contrib/elasticagent/model/reports/agent/KubernetesElasticAgent.java b/src/main/java/cd/go/contrib/elasticagent/model/reports/agent/KubernetesElasticAgent.java
@@ -92,7 +92,7 @@ private static ArrayList<KubernetesPodEvent> getAllEventsForPod(Pod pod, Kuberne
     }
 
     private static String getPodLogs(Pod pod, KubernetesClient client) {
-        return client.pods().inNamespace(Constants.KUBERNETES_NAMESPACE)
+        return client.pods()
                 .withName(pod.getMetadata().getName()).getLog(true);
     }
 
diff --git a/src/main/resources/plugin-settings.template.html b/src/main/resources/plugin-settings.template.html
@@ -94,15 +94,15 @@
 	<fieldset>
 		<legend>Cluster credentials</legend>
 		<div class="row">
-			<div class="columns large-6">
+			<div class="columns large-5">
 				<label>Cluster URL<span class='asterix'>*</span></label>
 				<input type="text" ng-model="kubernetes_cluster_url" ng-required="true"/>
 				<span class="form_error" ng-show="GOINPUTNAME[kubernetes_cluster_url].$error.server">{{GOINPUTNAME[kubernetes_cluster_url].$error.server}}</span>
 				<label class="form-help-content">
 					Kubernetes Cluster URL. Can be obtained by running <code>kubectl cluster-info</code>
 				</label>
 			</div>
-			<div class="columns large-6">
+			<div class="columns large-5 end">
 				<label>Namespace</label>
 				<input type="text" ng-model="namespace" ng-required="true"/>
 				<span class="form_error" ng-show="GOINPUTNAME[namespace].$error.server">{{GOINPUTNAME[namespace].$error.server}}</span>
@@ -129,7 +129,8 @@
 			<textarea ng-model="kubernetes_cluster_ca_cert" rows="7"></textarea>
 			<span class="form_error" ng-show="GOINPUTNAME[kubernetes_cluster_ca_cert].$error.server">{{GOINPUTNAME[kubernetes_cluster_ca_cert].$error.server}}</span>
 			<label class="form-help-content">
-				Kubernetes cluster ca certificate data.
+				Kubernetes cluster ca certificate data. Do not provide <code> -----BEGIN * </code> and <code> -----END
+				* </code> in your certificate data.
 			</label>
 		</div>
 	</fieldset>
diff --git a/src/test/java/cd/go/contrib/elasticagent/KubernetesAgentInstancesIntegrationTest.java b/src/test/java/cd/go/contrib/elasticagent/KubernetesAgentInstancesIntegrationTest.java
@@ -63,9 +63,6 @@ public void setUp() throws Exception {
         initMocks(this);
         kubernetesAgentInstances = new KubernetesAgentInstances(mockedKubernetesClientFactory);
         when(mockedKubernetesClientFactory.client(any())).thenReturn(mockKubernetesClient);
-
-        when(pods.inNamespace(Constants.KUBERNETES_NAMESPACE)).thenReturn(pods);
-
         when(pods.create(any())).thenAnswer((Answer<Pod>) invocation -> {
             Object[] args = invocation.getArguments();
             return (Pod) args[0];
diff --git a/src/test/java/cd/go/contrib/elasticagent/PluginSettingsTest.java b/src/test/java/cd/go/contrib/elasticagent/PluginSettingsTest.java
@@ -37,6 +37,7 @@ public void shouldDeserializeFromJSON() {
         pluginSettingsMap.put("kubernetes_cluster_url", "https://cloud.example.com");
         pluginSettingsMap.put("oauth_token", "foo-token");
         pluginSettingsMap.put("kubernetes_cluster_ca_cert", "foo-ca-certs");
+        pluginSettingsMap.put("namespace", "gocd");
 
         PluginSettings pluginSettings = PluginSettings.fromJSON(new Gson().toJson(pluginSettingsMap));
 
@@ -46,6 +47,7 @@ public void shouldDeserializeFromJSON() {
         assertThat(pluginSettings.getClusterUrl(), is("https://cloud.example.com"));
         assertThat(pluginSettings.getCaCertData(), is("foo-ca-certs"));
         assertThat(pluginSettings.getOauthToken(), is("foo-token"));
+        assertThat(pluginSettings.getNamespace(), is("gocd"));
 
     }
 
diff --git a/src/test/java/cd/go/contrib/elasticagent/executors/AgentStatusReportExecutorTest.java b/src/test/java/cd/go/contrib/elasticagent/executors/AgentStatusReportExecutorTest.java
@@ -1,6 +1,5 @@
 package cd.go.contrib.elasticagent.executors;
 
-import cd.go.contrib.elasticagent.Constants;
 import cd.go.contrib.elasticagent.KubernetesClientFactory;
 import cd.go.contrib.elasticagent.PluginRequest;
 import cd.go.contrib.elasticagent.PluginSettings;
@@ -57,9 +56,6 @@ public class AgentStatusReportExecutorTest {
     @Mock
     private MixedOperation<Pod, PodList, DoneablePod, PodResource<Pod, DoneablePod>> mockedOperation;
 
-    @Mock
-    private NonNamespaceOperation<Pod, PodList, DoneablePod, PodResource<Pod, DoneablePod>> mockedNamespaceOperation;
-
     @Mock
     private PodList podList;
 
@@ -79,18 +75,17 @@ public class AgentStatusReportExecutorTest {
     private Template template;
 
     @Before
-    public void setUp() throws Exception {
+    public void setUp() {
         initMocks(this);
         pod = createDefaultPod();
         pod.getMetadata().setName(elasticAgentId);
         executor = new AgentStatusReportExecutor(statusReportRequest, pluginRequest, kubernetesClientFactory, builder);
 
         when(client.pods()).thenReturn(mockedOperation);
-        when(mockedOperation.inNamespace(Constants.KUBERNETES_NAMESPACE)).thenReturn(mockedNamespaceOperation);
-        when(mockedNamespaceOperation.list()).thenReturn(podList);
+        when(mockedOperation.list()).thenReturn(podList);
         when(podList.getItems()).thenReturn(Arrays.asList(pod));
 
-        when(mockedNamespaceOperation.withName(elasticAgentId)).thenReturn(podresource);
+        when(mockedOperation.withName(elasticAgentId)).thenReturn(podresource);
         when(podresource.getLog()).thenReturn("agent-logs");
 
         when(client.events()).thenReturn(events);
diff --git a/src/test/java/cd/go/contrib/elasticagent/executors/ServerPingRequestExecutorTest.java b/src/test/java/cd/go/contrib/elasticagent/executors/ServerPingRequestExecutorTest.java
@@ -25,7 +25,6 @@
 import io.fabric8.kubernetes.api.model.PodList;
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
-import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation;
 import io.fabric8.kubernetes.client.dsl.PodResource;
 import org.joda.time.Period;
 import org.junit.Before;
@@ -50,8 +49,6 @@ public class ServerPingRequestExecutorTest extends BaseTest {
     @Mock
     private MixedOperation<Pod, PodList, DoneablePod, PodResource<Pod, DoneablePod>> mockedOperation;
     @Mock
-    private NonNamespaceOperation<Pod, PodList, DoneablePod, PodResource<Pod, DoneablePod>> mockedNamespaceOperation;
-    @Mock
     private Pod mockedPod;
     @Mock
     private PodResource podResource;
@@ -62,17 +59,15 @@ public void setUp() {
         initMocks(this);
         when(factory.client(any(PluginSettings.class))).thenReturn(mockedClient);
         when(mockedClient.pods()).thenReturn(mockedOperation);
-        when(mockedOperation.inNamespace(Constants.KUBERNETES_NAMESPACE)).thenReturn(mockedNamespaceOperation);
-
-        when(mockedNamespaceOperation.create(any(Pod.class))).thenAnswer(new Answer<Pod>() {
+        when(mockedOperation.create(any(Pod.class))).thenAnswer(new Answer<Pod>() {
             @Override
             public Pod answer(InvocationOnMock invocation) throws Throwable {
                 Object[] args = invocation.getArguments();
                 return (Pod) args[0];
             }
         });
 
-        when(mockedNamespaceOperation.withName(anyString())).thenReturn(podResource);
+        when(mockedOperation.withName(anyString())).thenReturn(podResource);
         when(podResource.get()).thenReturn(mockedPod);
 
         objectMetadata = new ObjectMeta();
diff --git a/src/test/java/cd/go/contrib/elasticagent/executors/ShouldAssignWorkRequestExecutorTest.java b/src/test/java/cd/go/contrib/elasticagent/executors/ShouldAssignWorkRequestExecutorTest.java
@@ -26,7 +26,6 @@
 import io.fabric8.kubernetes.api.model.PodList;
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
-import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation;
 import io.fabric8.kubernetes.client.dsl.PodResource;
 import org.junit.Before;
 import org.junit.Test;
@@ -38,7 +37,6 @@
 import java.util.Map;
 import java.util.UUID;
 
-import static cd.go.contrib.elasticagent.Constants.KUBERNETES_NAMESPACE;
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;
 import static org.mockito.ArgumentMatchers.any;
@@ -55,17 +53,14 @@ public class ShouldAssignWorkRequestExecutorTest extends BaseTest {
     private KubernetesClient mockedClient;
     @Mock
     private MixedOperation<Pod, PodList, DoneablePod, PodResource<Pod, DoneablePod>> mockedOperation;
-    @Mock
-    private NonNamespaceOperation<Pod, PodList, DoneablePod, PodResource<Pod, DoneablePod>> mockedNamespaceOperation;
     private String environment = "QA";
 
     @Before
     public void setUp() throws Exception {
         initMocks(this);
         when(factory.client(any(PluginSettings.class))).thenReturn(mockedClient);
         when(mockedClient.pods()).thenReturn(mockedOperation);
-        when(mockedOperation.inNamespace(KUBERNETES_NAMESPACE)).thenReturn(mockedNamespaceOperation);
-        when(mockedNamespaceOperation.create(any(Pod.class))).thenAnswer(new Answer<Pod>() {
+        when(mockedOperation.create(any(Pod.class))).thenAnswer(new Answer<Pod>() {
             @Override
             public Pod answer(InvocationOnMock invocation) throws Throwable {
                 Object[] args = invocation.getArguments();
diff --git a/src/test/java/cd/go/contrib/elasticagent/executors/StatusReportExecutorTest.java b/src/test/java/cd/go/contrib/elasticagent/executors/StatusReportExecutorTest.java
@@ -64,7 +64,6 @@ public void shouldBuildStatusReportView() throws Exception {
         when(nodes.list()).thenReturn(new NodeList());
         when(kubernetesClient.nodes()).thenReturn(nodes);
 
-        when(pods.inNamespace(Constants.KUBERNETES_NAMESPACE)).thenReturn(pods);
         when(pods.withLabel(Constants.CREATED_BY_LABEL_KEY, Constants.PLUGIN_ID)).thenReturn(pods);
         when(pods.list()).thenReturn(new PodList());
         when(kubernetesClient.pods()).thenReturn(pods);
diff --git a/src/test/java/cd/go/contrib/elasticagent/model/KubernetesClusterTest.java b/src/test/java/cd/go/contrib/elasticagent/model/KubernetesClusterTest.java
@@ -37,7 +37,6 @@ public void shouldCreateKubernetesClusterObject() throws Exception {
         when(nodes.list()).thenReturn(new NodeList());
         when(kubernetesClient.nodes()).thenReturn(nodes);
 
-        when(pods.inNamespace(Constants.KUBERNETES_NAMESPACE)).thenReturn(pods);
         when(pods.withLabel(Constants.CREATED_BY_LABEL_KEY, Constants.PLUGIN_ID)).thenReturn(pods);
         when(pods.list()).thenReturn(new PodList());
         when(kubernetesClient.pods()).thenReturn(pods);

Original file line number	Diff line number	Diff line change
`@@ -49,9 +49,9 @@ private KubernetesClient createClientFor(PluginSettings pluginSettings) {`
`49`	`49`	`final ConfigBuilder configBuilder = new ConfigBuilder()`
`50`	`50`	`.withOauthToken(pluginSettings.getOauthToken())`
`51`	`51`	`.withMasterUrl(pluginSettings.getClusterUrl())`
`52`		`- .withCaCertData(pluginSettings.getCaCertData());`
	`52`	`+ .withCaCertData(pluginSettings.getCaCertData())`
	`53`	`+ .withNamespace(pluginSettings.getNamespace());`
`53`	`54`
`54`		`- return new DefaultKubernetesClient(configBuilder.build())`
`55`		`- .inNamespace(pluginSettings.getNamespace());`
	`55`	`+ return new DefaultKubernetesClient(configBuilder.build());`
`56`	`56`	`}`
`57`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public KubernetesInstance(DateTime createdAt, String environment, String name, M`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`public void terminate(KubernetesClient client) {`
`43`		`- client.pods().inNamespace(Constants.KUBERNETES_NAMESPACE).withName(name).delete();`
	`43`	`+ client.pods().withName(name).delete();`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`public String name() {`
Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ private static void setAnnotations(Pod pod, CreateAgentRequest request) {`
`131`	`131`
`132`	`132`	`private KubernetesInstance createKubernetesPod(KubernetesClient client, Pod elasticAgentPod) {`
`133`	`133`	`LOG.info(format("[Create Agent] Creating K8s pod with spec: {0}.", elasticAgentPod.toString()));`
`134`		`- Pod pod = client.pods().inNamespace(KUBERNETES_NAMESPACE).create(elasticAgentPod);`
	`134`	`+ Pod pod = client.pods().create(elasticAgentPod);`
`135`	`135`	`return fromKubernetesPod(pod);`
`136`	`136`	`}`
`137`	`137`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ private static ArrayList<KubernetesPodEvent> getAllEventsForPod(Pod pod, Kuberne`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`private static String getPodLogs(Pod pod, KubernetesClient client) {`
`95`		`- return client.pods().inNamespace(Constants.KUBERNETES_NAMESPACE)`
	`95`	`+ return client.pods()`
`96`	`96`	`.withName(pod.getMetadata().getName()).getLog(true);`
`97`	`97`	`}`
`98`	`98`