fixed folder structure; fixed kubeval for missing schemas

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

Author: marekzan

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

@@ -26,10 +26,11 @@ abstract class Deployment {
     abstract preValidation(String stage)
     abstract postValidation(String stage)
 
+
     def validate(String stage) {
         gitopsConfig.validators.each { validatorConfig ->
             script.echo "Executing validator ${validatorConfig.key}"
-            validatorConfig.value.validator.validate(validatorConfig.value.enabled, "${stage}/${gitopsConfig.application}", validatorConfig.value.config, gitopsConfig.deployments)
+            validatorConfig.value.validator.validate(validatorConfig.value.enabled, "${stage}/${gitopsConfig.application}", validatorConfig.value.config, gitopsConfig)
         }
     }
 

src/com/cloudogu/gitopsbuildlib/deployment/helm/repotype/HelmRepo.groovy

@@ -30,6 +30,7 @@ class HelmRepo extends RepoType{
         withHelm {
             script.sh "helm repo add chartRepo ${helmConfig.repoUrl}${credentialArgs}"
             script.sh "helm repo update"
+            // helm pull also executes helm dependency so we don't need to do it in this step
             script.sh "helm pull chartRepo/${helmConfig.chartName} --version=${helmConfig.version} --untar --untardir=chart"
             String helmScript = "helm values chart/${helmConfig.chartName} ${valuesFilesWithParameter(valuesFiles)}"
             merge = script.sh returnStdout: true, script: helmScript

src/com/cloudogu/gitopsbuildlib/validation/HelmKubeval.groovy

@@ -1,7 +1,5 @@
 package com.cloudogu.gitopsbuildlib.validation
 
-import com.cloudogu.gitopsbuildlib.docker.DockerWrapper
-
 class HelmKubeval extends Validator {
 
     HelmKubeval(def script) {
@@ -11,33 +9,16 @@ class HelmKubeval extends Validator {
     @Override
     void validate(String targetDirectory, Map config, Map deployments) {
         if (deployments.containsKey('helm')) {
-            if (deployments.helm.repoType == 'GIT') {
-//                script.dir("${targetDirectory}/chart") {
-//                    def git = (deployments.helm.containsKey('credentialsId'))
-//                        ? script.cesBuildLib.Git.new(script, deployments.helm.credentialsId)
-//                        : script.cesBuildLib.Git.new(script)
-//                    git url: deployments.helm.repoUrl, branch: 'main', changelog: false, poll: false
-//
-//                    if(deployments.helm.containsKey('version') && deployments.helm.version) {
-//                        git.checkout(deployments.helm.version)
-//                    }
-//                }
-
-                def chartPath = ''
-                if (deployments.helm.containsKey('chartPath')) {
-                    chartPath = deployments.helm.chartPath
-                }
 
-                withDockerImage(config.image) {
-                    script.sh "helm kubeval chart/${chartPath} -v ${config.k8sSchemaVersion}"
-                }
+            def chartDir = ''
+            if (deployments.helm.containsKey('chartPath')) {
+                chartDir = deployments.helm.chartPath
+            } else if ( deployments.helm.containsKey('chartName')) {
+                chartDir = deployments.helm.chartName
+            }
 
-            } else if (deployments.helm.repoType == 'HELM') {
-                withDockerImage(config.image) {
-                    script.sh "helm repo add chartRepo ${deployments.helm.repoUrl}"
-                    script.sh "helm repo update"
-                    script.sh "helm kubeval chartRepo/${deployments.helm.chartName} --version=${deployments.helm.version} -v ${config.k8sSchemaVersion}"
-                }
+            withDockerImage(config.image) {
+                script.sh "helm kubeval chart/${chartDir} -v ${config.k8sSchemaVersion}"
             }
         }
     }

src/com/cloudogu/gitopsbuildlib/validation/Kubeval.groovy

@@ -1,21 +1,18 @@
 package com.cloudogu.gitopsbuildlib.validation
 
-import com.cloudogu.gitopsbuildlib.docker.DockerWrapper
-
 /**
  * Validates all yaml-resources within the target-directory against the specs of the given k8s version
  */
 class Kubeval extends Validator {
 
-
     Kubeval(def script) {
         super(script)
     }
 
     @Override
     void validate(String targetDirectory, Map config, Map deployments) {
         withDockerImage(config.image) {
-            script.sh "kubeval -d ${targetDirectory} -v ${config.k8sSchemaVersion} --strict"
+            script.sh "kubeval -d ${targetDirectory} -v ${config.k8sSchemaVersion} --strict --ignore-missing-schemas"
         }
     }
 }

src/com/cloudogu/gitopsbuildlib/validation/Validator.groovy

@@ -12,9 +12,9 @@ abstract class Validator {
         dockerWrapper = new DockerWrapper(script)
     }
 
-    void validate(boolean enabled, String targetDirectory, Map config, Map deployments) {
+    void validate(boolean enabled, String targetDirectory, Map config, Map gitopsConfig) {
         if (enabled) {
-            validate(targetDirectory, config, deployments)
+            validate(targetDirectory, config, gitopsConfig)
         } else {
             script.echo "Skipping validator ${this.getClass().getSimpleName()} because it is configured as enabled=false"
         }

src/com/cloudogu/gitopsbuildlib/validation/Yamllint.groovy

@@ -16,7 +16,7 @@ class Yamllint extends Validator {
     }
 
     @Override
-    void validate(String targetDirectory, Map config, Map deployments) {
+    void validate(String targetDirectory, Map config, Map gitopsConfig) {
         withDockerImage(config.image) {
             script.sh "yamllint " +
                 "${config.profile ? "-d ${config.profile} " : ''}" +