plain vs helm folder structure fix

Signed-off-by: Marek Markiewka <marek.markiewka@cloudogu.com>

Author: marekzan

src/com/cloudogu/gitopsbuildlib/deployment/Deployment.groovy

@@ -3,6 +3,7 @@ package com.cloudogu.gitopsbuildlib.deployment
 abstract class Deployment {
 
     protected static String getKubectlImage() { 'lachlanevenson/k8s-kubectl:v1.19.3' }
+    protected String extraResourcesFolder = ""
 
     static String getConfigDir() { '.config' }
 
@@ -36,11 +37,11 @@ abstract class Deployment {
         def sourcePath = gitopsConfig.deployments.sourcePath
         def application = gitopsConfig.application
 
-        script.sh "mkdir -p ${stage}/${application}/extraResources/"
+        script.sh "mkdir -p ${stage}/${application}/${extraResourcesFolder}"
         script.sh "mkdir -p ${configDir}/"
         // copy extra resources like sealed secrets
-        script.echo "Copying k8s payload from application repo to gitOps Repo: '${sourcePath}/${stage}/*' to '${stage}/${application}/extraResources/'"
-        script.sh "cp -r ${script.env.WORKSPACE}/${sourcePath}/${stage}/* ${stage}/${application}/extraResources/ || true"
+        script.echo "Copying k8s payload from application repo to gitOps Repo: '${sourcePath}/${stage}/*' to '${stage}/${application}/${extraResourcesFolder}'"
+        script.sh "cp -r ${script.env.WORKSPACE}/${sourcePath}/${stage}/* ${stage}/${application}/${extraResourcesFolder} || true"
         script.sh "cp ${script.env.WORKSPACE}/*.yamllint.yaml ${configDir}/ || true"
     }
 

src/com/cloudogu/gitopsbuildlib/deployment/helm/Helm.groovy

@@ -15,6 +15,7 @@ class Helm extends Deployment {
 
     Helm(def script, def gitopsConfig) {
         super(script, gitopsConfig)
+        this.extraResourcesFolder = "extraResources"
         if (gitopsConfig.deployments.helm.repoType == 'GIT') {
             chartRepo = new GitRepo(script)
         } else if (gitopsConfig.deployments.helm.repoType == 'HELM') {

src/com/cloudogu/gitopsbuildlib/deployment/helm/helmrelease/ArgoCDRelease.groovy

@@ -40,11 +40,10 @@ class ArgoCDRelease extends HelmRelease{
     private String createHelmRelease(String chartPath, String application, String mergedValuesFile) {
         String helmRelease = ""
         dockerWrapper.withHelm {
-            script.dir("chart/${chartPath}") {
-                String templateScript = "helm template ${application} . -f ${mergedValuesFile}"
-                helmRelease = script.sh returnStdout: true, script: templateScript
-            }
+            String templateScript = "helm template ${application} chart/${chartPath} -f ${mergedValuesFile}"
+            helmRelease = script.sh returnStdout: true, script: templateScript
         }
+
         // this line removes all empty lines since helm template creates some and the helm validator will throw an error if there are emtpy lines present
         helmRelease = helmRelease.replaceAll("(?m)^[ \t]*\r?\n", "")
         return helmRelease