fix: Missed Mojo parameters in OpenshiftHelmMojo

Signed-off-by: Marc Nuri <[email protected]>
rohanKanojia · Mar 26, 2020 · 3b34640 · 3b34640
1 parent cb17a9e
commit 3b34640
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/...maven-plugin/plugin/src/main/java/org/eclipse/jkube/maven/plugin/mojo/build/HelmMojo.java b/...maven-plugin/plugin/src/main/java/org/eclipse/jkube/maven/plugin/mojo/build/HelmMojo.java
@@ -65,20 +65,22 @@ public class HelmMojo extends AbstractJKubeMojo {
   private static final String PROPERTY_OUTPUT_DIR = "jkube.helm.outputDir";
   private static final String PROPERTY_TARBALL_OUTPUT_DIR = "jkube.helm.tarballOutputDir";
   private static final String DEFAULT_CHART_EXTENSION = "tar.gz";
+  static final String PROPERTY_KUBERNETES_MANIFEST = "jkube.kubernetesManifest";
+  static final String PROPERTY_KUBERNETES_TEMPLATE = "jkube.kubernetesTemplate";
 
   @Parameter
   HelmConfig helm;
 
   /**
    * The generated kubernetes YAML file
    */
-  @Parameter(property = "jkube.kubernetesManifest", defaultValue = "${basedir}/target/classes/META-INF/jkube/kubernetes.yml")
+  @Parameter(property = PROPERTY_KUBERNETES_MANIFEST, defaultValue = "${basedir}/target/classes/META-INF/jkube/kubernetes.yml")
   File kubernetesManifest;
 
   /**
    * The generated kubernetes YAML file
    */
-  @Parameter(property = "jkube.kubernetesTemplate", defaultValue = "${basedir}/target/classes/META-INF/jkube/kubernetes")
+  @Parameter(property = PROPERTY_KUBERNETES_TEMPLATE, defaultValue = "${basedir}/target/classes/META-INF/jkube/kubernetes")
   File kubernetesTemplate;
 
   @Component

diff --git a/...gin/plugin/src/main/java/org/eclipse/jkube/maven/plugin/mojo/build/OpenshiftHelmMojo.java b/...gin/plugin/src/main/java/org/eclipse/jkube/maven/plugin/mojo/build/OpenshiftHelmMojo.java
@@ -15,11 +15,26 @@
 
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
 import org.eclipse.jkube.kit.resource.helm.HelmConfig;
 
+import java.io.File;
+
 @Mojo(name = "helm", defaultPhase = LifecyclePhase.PRE_INTEGRATION_TEST)
 public class OpenshiftHelmMojo extends HelmMojo {
 
+  /**
+   * The generated kubernetes YAML file
+   */
+  @Parameter(property = PROPERTY_KUBERNETES_MANIFEST, defaultValue = "${basedir}/target/classes/META-INF/jkube/openshift.yml")
+  File kubernetesManifest; // NOSONAR (Override Mojo Property en HelmMojo)
+
+  /**
+   * The generated kubernetes YAML file
+   */
+  @Parameter(property = PROPERTY_KUBERNETES_TEMPLATE, defaultValue = "${basedir}/target/classes/META-INF/jkube/openshift")
+  File kubernetesTemplate; // NOSONAR (Override Mojo Property en HelmMojo)
+
   @Override
   protected HelmConfig.HelmType getDefaultHelmType() {
     return HelmConfig.HelmType.OPENSHIFT;