JENKINS-68757 - adding subPath support for PersistentVolumeClaim volumes

src/main/java/org/csanchez/jenkins/plugins/kubernetes/PodTemplateBuilder.java

@@ -53,6 +53,7 @@
 import org.csanchez.jenkins.plugins.kubernetes.pod.decorator.PodDecorator;
 import org.csanchez.jenkins.plugins.kubernetes.volumes.PodVolume;
 import org.csanchez.jenkins.plugins.kubernetes.volumes.ConfigMapVolume;
+import org.csanchez.jenkins.plugins.kubernetes.volumes.PersistentVolumeClaim;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 
@@ -189,7 +190,11 @@ public Pod build() {
         String podName = agent.getPodName();
         int i = 0;
         for (final PodVolume volume : template.getVolumes()) {
-            final String volumeName = "volume-" + i;
+            String volumeNameTmp = "volume-" + i;
+            if (volume instanceof PersistentVolumeClaim) {
+        	volumeNameTmp = "volume-" + ((PersistentVolumeClaim)volume).getClaimName();
+            }
+            final String volumeName = volumeNameTmp;
             final String mountPath = normalizePath(volume.getMountPath());
             if (!volumeMounts.containsKey(mountPath)) {
                 VolumeMountBuilder volumeMountBuilder = new VolumeMountBuilder() //
@@ -202,8 +207,17 @@ public Pod build() {
                         volumeMountBuilder = volumeMountBuilder.withSubPath(normalizePath(subPath));
                     }
                 }
+                if (volume instanceof PersistentVolumeClaim) {
+                    final PersistentVolumeClaim pvcVolume = (PersistentVolumeClaim) volume;
+                    String subPath = pvcVolume.getSubPath();
+                    if (subPath != null && subPath.length()>0) {
+                        volumeMountBuilder = volumeMountBuilder.withSubPath(normalizePath(subPath));
+                    }
+                }
                 volumeMounts.put(mountPath, volumeMountBuilder.build());
-                volumes.put(volumeName, volume.buildVolume(volumeName, podName));
+                if (!volumes.containsKey(volumeName)) {
+                    volumes.put(volumeName, volume.buildVolume(volumeName, podName));
+                }
                 i++;
             }
         }

src/main/java/org/csanchez/jenkins/plugins/kubernetes/volumes/PersistentVolumeClaim.java

@@ -28,6 +28,7 @@
 import edu.umd.cs.findbugs.annotations.NonNull;
 import org.jenkinsci.Symbol;
 import org.kohsuke.stapler.DataBoundConstructor;
+import org.kohsuke.stapler.DataBoundSetter;
 
 import hudson.Extension;
 import hudson.model.Descriptor;
@@ -36,6 +37,7 @@
 
 public class PersistentVolumeClaim extends PodVolume {
     private String mountPath;
+    private String subPath;    
     private String claimName;
     @CheckForNull
     private Boolean readOnly;
@@ -61,6 +63,14 @@ public Boolean getReadOnly() {
         return readOnly != null && readOnly;
     }
 
+    public String getSubPath() {
+        return subPath;
+    }
+
+    @DataBoundSetter
+    public void setSubPath(String subPath) {
+        this.subPath = subPath;
+    }
     @Override
     public Volume buildVolume(String volumeName) {
         return new VolumeBuilder()

src/main/resources/org/csanchez/jenkins/plugins/kubernetes/volumes/PersistentVolumeClaim/config.jelly

@@ -13,5 +13,9 @@
   <f:entry title="${%Mount path}" field="mountPath">
     <f:textbox />
   </f:entry>
+
+  <f:entry title="${%Mount subPath}" field="subPath">
+    <f:textbox />
+  </f:entry>
 
 </j:jelly>

src/main/resources/org/csanchez/jenkins/plugins/kubernetes/volumes/PersistentVolumeClaim/config_zh_CN.properties

@@ -23,3 +23,4 @@
 Claim\ Name=\u7533\u660E\u503C
 Read\ Only=\u53EA\u8BFB
 Mount\ path=\u6302\u8F7D\u8DEF\u5F84
+Mount\ subPath=\u5b50\u8def\u5f84

src/test/java/org/csanchez/jenkins/plugins/kubernetes/PersistentVolumeClaimTest.java

@@ -0,0 +1,23 @@
+package org.csanchez.jenkins.plugins.kubernetes;
+
+import org.csanchez.jenkins.plugins.kubernetes.volumes.PersistentVolumeClaim;
+
+import static org.junit.Assert.*;
+import org.junit.Test;
+
+public class PersistentVolumeClaimTest {
+
+    @Test
+    public void testNullSubPathValue() {
+	PersistentVolumeClaim persistentVolumeClaim= new PersistentVolumeClaim("oneMountPath", "Myvolume",false);
+        assertNull(persistentVolumeClaim.getSubPath());
+    }
+
+    @Test
+    public void testValidSubPathValue() {
+	PersistentVolumeClaim persistentVolumeClaim= new PersistentVolumeClaim("oneMountPath", "Myvolume",false);
+	persistentVolumeClaim.setSubPath("miSubpath");
+        assertEquals(persistentVolumeClaim.getSubPath(),"miSubpath");
+    }
+
+}