WIP prepare merge with upstream master

Author: mcamposv

.gitignore

@@ -4,12 +4,10 @@
 /.factorypath
 /.settings/
 /work/
-
 /.idea/
 *.iml
 nbactions.xml
 nb-configuration.xml
 *.bak
 /.vscode/
-
 **/.DS_Store

pom.xml

@@ -47,7 +47,7 @@
     <jenkins.host.address />
     <slaveAgentPort />
     <java.level>8</java.level>
-    <jenkins.version>2.277.1</jenkins.version>
+    <jenkins.version>2.263.1</jenkins.version>
     <no-test-jar>false</no-test-jar>
     <useBeta>true</useBeta>
   </properties>
@@ -93,7 +93,7 @@
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>durable-task</artifactId>
-      <version>1.39</version>
+      <version>1.35</version>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>

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

@@ -47,6 +47,7 @@
 import org.csanchez.jenkins.plugins.kubernetes.pipeline.PodTemplateStepExecution;
 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.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 
@@ -81,7 +82,6 @@
 import static org.csanchez.jenkins.plugins.kubernetes.PodTemplateUtils.combine;
 import static org.csanchez.jenkins.plugins.kubernetes.PodTemplateUtils.isNullOrEmpty;
 import static org.csanchez.jenkins.plugins.kubernetes.PodTemplateUtils.substituteEnv;
-import org.csanchez.jenkins.plugins.kubernetes.volumes.ConfigMapVolume;
 
 /**
  * Helper class to build Pods from PodTemplates
@@ -179,10 +179,10 @@ public Pod build() {
 
                 if (volume instanceof ConfigMapVolume) {
                     final ConfigMapVolume configmapVolume = (ConfigMapVolume) volume;
-                        //We need to normalize the subPath or we can end up in really hard to debug issues Just in case.
-                        final String subPath = substituteEnv(Paths.get(configmapVolume.getSubPath()).normalize().toString().replace("\\", "/"));
-                        volumeMountBuilder = volumeMountBuilder.withSubPath(subPath);
-                            }
+                    //We need to normalize the subPath or we can end up in really hard to debug issues Just in case.
+                    final String subPath = substituteEnv(Paths.get(configmapVolume.getSubPath()).normalize().toString().replace("\\", "/"));
+                    volumeMountBuilder = volumeMountBuilder.withSubPath(subPath);
+                }
                 volumeMounts.put(mountPath, volumeMountBuilder.build());
                 volumes.put(volumeName, volume.buildVolume(volumeName));
                 i++;