Merge pull request #101 from jenkinsci/JENKINS-39867

[JENKINS-39867] Upgrade fabric8 to 1.4.26
jenkinsci · Dec 6, 2016 · 52c0af5 · 52c0af5
2 parents 468ee9e + 0eb2d14
commit 52c0af5
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -37,7 +37,7 @@
     <jackson.version>2.5.0</jackson.version>
     <jenkins.version>2.7.4</jenkins.version>
 
-    <kubernetes-client.version>1.3.98</kubernetes-client.version>
+    <kubernetes-client.version>1.4.26</kubernetes-client.version>
     <spring.version>3.2.14.RELEASE</spring.version>
     <slf4j.version>1.7.7</slf4j.version>
 

diff --git a/src/main/java/org/csanchez/jenkins/plugins/kubernetes/KubernetesCloud.java b/src/main/java/org/csanchez/jenkins/plugins/kubernetes/KubernetesCloud.java
@@ -347,7 +347,7 @@ private Container createContainer(KubernetesSlave slave, ContainerTemplate conta
         List<VolumeMount> containerMounts = new ArrayList<>(volumeMounts);
         if (!Strings.isNullOrEmpty(containerTemplate.getWorkingDir())
                 && !PodVolume.volumeMountExists(containerTemplate.getWorkingDir(), volumeMounts)) {
-            containerMounts.add(new VolumeMount(containerTemplate.getWorkingDir(), WORKSPACE_VOLUME_NAME, false));
+            containerMounts.add(new VolumeMount(containerTemplate.getWorkingDir(), WORKSPACE_VOLUME_NAME, false, null));
         }
 
         return new ContainerBuilder()
@@ -387,7 +387,7 @@ private Pod getPodTemplate(KubernetesSlave slave, Label label) {
             //We need to normalize the path or we can end up in really hard to debug issues.
             final String mountPath = substituteEnv(Paths.get(volume.getMountPath()).normalize().toString());
             if (!volumeMounts.containsKey(mountPath)) {
-                volumeMounts.put(mountPath, new VolumeMount(mountPath, volumeName, false));
+                volumeMounts.put(mountPath, new VolumeMount(mountPath, volumeName, false, null));
                 volumes.add(volume.buildVolume(volumeName));
                 i++;
             }

diff --git a/src/main/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/ContainerExecDecorator.java b/src/main/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/ContainerExecDecorator.java
@@ -16,8 +16,6 @@
 
 package org.csanchez.jenkins.plugins.kubernetes.pipeline;
 
-import com.squareup.okhttp.Response;
-
 import hudson.Launcher;
 import hudson.LauncherDecorator;
 import hudson.Proc;
@@ -30,6 +28,7 @@
 import io.fabric8.kubernetes.client.Watcher;
 import io.fabric8.kubernetes.client.dsl.ExecListener;
 import io.fabric8.kubernetes.client.dsl.ExecWatch;
+import okhttp3.Response;
 
 import java.io.Closeable;
 import java.io.IOException;

diff --git a/src/main/java/org/csanchez/jenkins/plugins/kubernetes/volumes/SecretVolume.java b/src/main/java/org/csanchez/jenkins/plugins/kubernetes/volumes/SecretVolume.java
@@ -47,7 +47,7 @@ public SecretVolume(String mountPath, String secretName) {
     public Volume buildVolume(String volumeName) {
         return new VolumeBuilder()
                 .withName(volumeName)
-                .withNewSecret(getSecretName())
+                .withNewSecret().withSecretName(getSecretName()).endSecret()
                 .build();
     }