From 6bf2b7aa2a0c1ad04094b1de7d5634954973cfc7 Mon Sep 17 00:00:00 2001
From: konsthol <konsthol@konsthol.eu>
Date: Wed, 28 May 2025 10:26:46 +0300
Subject: [PATCH] forgot to save that file

---
 vars/buildAndDeploy.groovy          | 3 ++-
 vars/deployHelm.groovy              | 4 ++--
 vars/jenkinsPipelineSkeleton.groovy | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/vars/buildAndDeploy.groovy b/vars/buildAndDeploy.groovy
index 585063c..8cc75bb 100644
--- a/vars/buildAndDeploy.groovy
+++ b/vars/buildAndDeploy.groovy
@@ -1,6 +1,6 @@
 import com.example.DockerBuilder
 
-def call(String appName, String helmChartPath, String helmRepoName,String helmChartVersion, Boolean useCustomDocker, Boolean useInsecureRegistry, Integer appPort) {
+def call(String appName, String helmChartPath, String helmRepoName, String namespace, String helmChartVersion, Boolean useCustomDocker, Boolean useInsecureRegistry, Integer appPort) {
     def dockerBuilder = new DockerBuilder()
     def containerName = useCustomDocker ? 'custom-docker' : 'docker'
 
@@ -48,6 +48,7 @@ def call(String appName, String helmChartPath, String helmRepoName,String helmCh
                 appName,
                 helmRepoName,
                 appName,
+                namespace,
                 helmChartVersion,
                 env.KUBERNETES_API,
                 env.KUBERNETES_TOKEN,
diff --git a/vars/deployHelm.groovy b/vars/deployHelm.groovy
index e092c1d..ccd4ccf 100644
--- a/vars/deployHelm.groovy
+++ b/vars/deployHelm.groovy
@@ -1,6 +1,6 @@
-def call(String releaseName, String chartRepo, String chartName, String version, String kubeApi, String kubeToken, Map values = [:]) {
+def call(String releaseName, String chartRepo, String chartName, String namespace, String version, String kubeApi, String kubeToken, Map values = [:]) {
     container('helm') {
-        def helmCommand = "helm install ${releaseName} ${chartRepo}/${chartName} --version ${version} --kube-apiserver ${kubeApi} --kube-token ${kubeToken} --kube-insecure-skip-tls-verify"
+        def helmCommand = "helm install ${releaseName} ${chartRepo}/${chartName} --namespace ${namespace} --version ${version} --kube-apiserver ${kubeApi} --kube-token ${kubeToken} --kube-insecure-skip-tls-verify"
 
         values.each { key, value ->
             helmCommand += " --set ${key}=${value}"
diff --git a/vars/jenkinsPipelineSkeleton.groovy b/vars/jenkinsPipelineSkeleton.groovy
index 42d7dfb..357c4d4 100644
--- a/vars/jenkinsPipelineSkeleton.groovy
+++ b/vars/jenkinsPipelineSkeleton.groovy
@@ -29,7 +29,7 @@ def call(String projectName, Map config) {
             stage('Build and Deploy') {
                 steps {
                     script {
-                        buildAndDeploy(projectName, config.helmChart, config.helmRepo, config.version, config.useCustomDocker, config.useInsecureRegistry, config.port)
+                        buildAndDeploy(projectName, config.helmChart, config.helmRepo, config.namespace, config.version, config.useCustomDocker, config.useInsecureRegistry, config.port)
                     }
                 }
             }