Demos: run integration tests for the Kubernetes example

Author: v1v

demos/kubernetes/README.md

@@ -4,46 +4,62 @@ Jenkins can be installed in Kubernetes and preconfigured to run jobs (and other
 options) in the Kubernetes cluster, using YAML stored in a `ConfigMap`.
 See [config.yml](config.yml) for the `ConfigMap` definition.
 
-Example installation on Kubernetes:
-
-```bash
-kubectl apply -f service-account.yml
-kubectl apply -f config.yml
-kubectl apply -f jenkins.yml
-```
-
-## Sample configuration
+## Advanced sample configuration
 
 ```yaml
-jenkins:
+unclassified:
   location:
     url: http://jenkins/
-  clouds:
-    - kubernetes:
-        name: kubernetes
-        containerCapStr: 100
-```
-
-## Advanced sample configuration
 
-```yaml
 jenkins:
-  location:
-    url: http://jenkins/
   clouds:
     - kubernetes:
         name: "advanced-k8s-config"
         serverUrl: "https://avanced-k8s-config:443"
+        serverCertificate: "serverCertificate"
         skipTlsVerify: true
-        namespace: "default"
         credentialsId: "advanced-k8s-credentials"
+        namespace: "default"
         jenkinsUrl: "http://jenkins/"
-        connectTimeout: 0
-        readTimeout: 0
-        containerCapStr: 100
+        jenkinsTunnel: "jenkinsTunnel"
+        containerCapStr: 42
         maxRequestsPerHostStr: 64
         retentionTimeout: 5
+        connectTimeout: 10
+        readTimeout: 20
+
         templates:
+          - name: "test"
+            serviceAccount: "serviceAccount"
+            instanceCap: 1234
+            idleMinutes: 0
+            label: "label"
+            volumes:
+              - hostPathVolume:
+                  mountPath: "mountPath"
+                  hostPath: "hostPath"
+
+            containers:
+              - name: "name"
+                image: "image"
+                privileged: true
+                alwaysPullImage: true
+                command: "command"
+                args: "args"
+                workingDir: "workingDir"
+                ttyEnabled: true
+                resourceRequestCpu: "resourceRequestCpu"
+                resourceRequestMemory: "resourceRequestMemory"
+                resourceLimitCpu: "resourceLimitCpu"
+                resourceLimitMemory: "resourceLimitMemory"
+            imagePullSecrets:
+              - name: "imagePullSecrets"
+
+            envVars:
+              - envVar:
+                  key: "FOO"
+                  value: "BAR"
+
           - name: "k8s-slave"
             namespace: "default"
             label: "linux-x86_64"
@@ -66,3 +82,11 @@ jenkins:
             activeDeadlineSeconds: "120"
             slaveConnectTimeout: "1000"
 ```
+
+## Example installation on Kubernetes
+
+```bash
+kubectl apply -f service-account.yml
+kubectl apply -f config.yml
+kubectl apply -f jenkins.yml
+```

demos/kubernetes/adv_config.yml

@@ -7,9 +7,10 @@ metadata:
   name: jenkins-configuration-as-code
 data:
   configuration-as-code.yaml: |
-    jenkins:
+    unclassified:
       location:
         url: http://jenkins/
+    jenkins:
       clouds:
         - kubernetes:
             name: "advanced-k8s-config"

integrations/src/test/java/io/jenkins/plugins/casc/KubernetesCloudTest.java

@@ -1,7 +1,8 @@
 package io.jenkins.plugins.casc;
 
-import io.jenkins.plugins.casc.misc.ConfiguredWithCode;
-import io.jenkins.plugins.casc.misc.JenkinsConfiguredWithCodeRule;
+import hudson.model.Node.Mode;
+import io.jenkins.plugins.casc.misc.ConfiguredWithReadme;
+import io.jenkins.plugins.casc.misc.JenkinsConfiguredWithReadmeRule;
 import java.util.List;
 import org.csanchez.jenkins.plugins.kubernetes.KubernetesCloud;
 import org.csanchez.jenkins.plugins.kubernetes.PodTemplate;
@@ -22,27 +23,29 @@
 public class KubernetesCloudTest {
 
     @Rule
-    public JenkinsConfiguredWithCodeRule j = new JenkinsConfiguredWithCodeRule();
+    public JenkinsConfiguredWithReadmeRule j = new JenkinsConfiguredWithReadmeRule();
 
     @Test
-    @ConfiguredWithCode("KubernetesCloudTest.yml")
+    @ConfiguredWithReadme("kubernetes/README.md")
     public void configure_kubernetes_cloud() throws Exception {
         final KubernetesCloud cloud = j.jenkins.clouds.get(KubernetesCloud.class);
         assertNotNull(cloud);
-        assertEquals("kubernetes", cloud.name);
-        assertEquals("serverUrl", cloud.getServerUrl());
+        assertEquals("advanced-k8s-config", cloud.name);
+        assertEquals("https://avanced-k8s-config:443", cloud.getServerUrl());
         assertEquals("serverCertificate", cloud.getServerCertificate());
         assertTrue(cloud.isSkipTlsVerify());
-        assertEquals("namespace", cloud.getNamespace());
-        assertEquals("jenkinsUrl", cloud.getJenkinsUrl());
+        assertEquals("default", cloud.getNamespace());
+        assertEquals("http://jenkins/", cloud.getJenkinsUrl());
+        assertEquals("advanced-k8s-credentials", cloud.getCredentialsId());
         assertEquals("jenkinsTunnel", cloud.getJenkinsTunnel());
         assertEquals(42, cloud.getContainerCap());
         assertEquals(5, cloud.getRetentionTimeout());
         assertEquals(10, cloud.getConnectTimeout());
         assertEquals(20, cloud.getReadTimeout());
+        assertEquals("64", cloud.getMaxRequestsPerHostStr());
 
         final List<PodTemplate> templates = cloud.getTemplates();
-        assertEquals(1, templates.size());
+        assertEquals(2, templates.size());
         final PodTemplate template = templates.get(0);
         assertEquals("test", template.getName());
         assertEquals("serviceAccount", template.getServiceAccount());
@@ -61,6 +64,11 @@ public void configure_kubernetes_cloud() throws Exception {
         final KeyValueEnvVar envVar = (KeyValueEnvVar) envVars.get(0);
         assertEquals("FOO", envVar.getKey());
         assertEquals("BAR", envVar.getValue());
+
+        final PodTemplate template1 = templates.get(1);
+        assertEquals("k8s-slave", template1.getName());
+        assertEquals("default", template1.getNamespace());
+        assertEquals(Mode.EXCLUSIVE, template1.getNodeUsageMode());
     }
 }