From 5337313b3af09e8159ea37a9656c03ac300c014e Mon Sep 17 00:00:00 2001 From: Sebastien Requiem Date: Wed, 5 Feb 2020 10:55:53 +0100 Subject: [PATCH 1/2] Adds the possibility to mount an existing volume --- .../kubernetes/volumes/ExistingVolume.java | 72 +++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 src/main/java/org/csanchez/jenkins/plugins/kubernetes/volumes/ExistingVolume.java diff --git a/src/main/java/org/csanchez/jenkins/plugins/kubernetes/volumes/ExistingVolume.java b/src/main/java/org/csanchez/jenkins/plugins/kubernetes/volumes/ExistingVolume.java new file mode 100644 index 0000000000..f19087afa0 --- /dev/null +++ b/src/main/java/org/csanchez/jenkins/plugins/kubernetes/volumes/ExistingVolume.java @@ -0,0 +1,72 @@ +/* + * The MIT License + * + * Copyright (c) 2016, CloudBees, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +package org.csanchez.jenkins.plugins.kubernetes.volumes; + +import javax.annotation.CheckForNull; +import javax.annotation.Nonnull; + +import org.jenkinsci.Symbol; +import org.kohsuke.stapler.DataBoundConstructor; + +import hudson.Extension; +import hudson.model.Descriptor; +import io.fabric8.kubernetes.api.model.Volume; +import io.fabric8.kubernetes.api.model.VolumeBuilder; + +public class ExistingVolume extends PodVolume { + + private String mountPath; + private String volumeName; + + @DataBoundConstructor + public ExistingDirVolume(String volumeName, String mountPath) { + this.volumeName = volumeName; + this.mountPath = mountPath; + } + + @Override + public String getMountPath() { + return mountPath; + } + + @Override + public Volume buildVolume(String volumeName) { + return new VolumeBuilder().withName(volumeName).build(); + } + + @Override + public String toString() { + return "ExistingVolume [mountPath=" + mountPath + ", volume=" + volumeName + "]"; + } + + @Extension + @Symbol("existingVolume") + public static class DescriptorImpl extends Descriptor { + @Override + public String getDisplayName() { + return "Existing Volume"; + } + } +} \ No newline at end of file From 150183feddcf5187eb5274a20505e78f4eadb3eb Mon Sep 17 00:00:00 2001 From: Sebastien Requiem Date: Wed, 5 Feb 2020 12:08:53 +0100 Subject: [PATCH 2/2] Fix typo in class name --- .../jenkins/plugins/kubernetes/volumes/ExistingVolume.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/csanchez/jenkins/plugins/kubernetes/volumes/ExistingVolume.java b/src/main/java/org/csanchez/jenkins/plugins/kubernetes/volumes/ExistingVolume.java index f19087afa0..334a2ae25c 100644 --- a/src/main/java/org/csanchez/jenkins/plugins/kubernetes/volumes/ExistingVolume.java +++ b/src/main/java/org/csanchez/jenkins/plugins/kubernetes/volumes/ExistingVolume.java @@ -41,7 +41,7 @@ public class ExistingVolume extends PodVolume { private String volumeName; @DataBoundConstructor - public ExistingDirVolume(String volumeName, String mountPath) { + public ExistingVolume(String volumeName, String mountPath) { this.volumeName = volumeName; this.mountPath = mountPath; } @@ -69,4 +69,4 @@ public String getDisplayName() { return "Existing Volume"; } } -} \ No newline at end of file +}