From c4079b40491304ec12b358da1df9e508e990a890 Mon Sep 17 00:00:00 2001
From: konsthol <konsthol@konsthol.eu>
Date: Mon, 26 May 2025 12:44:48 +0300
Subject: [PATCH] corrected how environment variables are read

---
 vars/addHelmRepo.groovy        | 4 +++-
 vars/deployHelm.groovy         | 5 ++++-
 vars/dockerBuildAndPush.groovy | 7 +++++--
 vars/uploadHelmChart.groovy    | 4 +++-
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/vars/addHelmRepo.groovy b/vars/addHelmRepo.groovy
index 7cd499c..b05b109 100644
--- a/vars/addHelmRepo.groovy
+++ b/vars/addHelmRepo.groovy
@@ -1,4 +1,6 @@
-def call(String repoName, String repoUrl) {
+def call(String repoName) {
+    def repoUrl = env.NEXUS_URL
+
     container('helm') {
         sh "helm repo add ${repoName} ${repoUrl}"
         sh 'helm repo update'
diff --git a/vars/deployHelm.groovy b/vars/deployHelm.groovy
index 3c35021..67179d0 100644
--- a/vars/deployHelm.groovy
+++ b/vars/deployHelm.groovy
@@ -1,4 +1,7 @@
-def call(String releaseName, String chartRepo, String chartName, String version, String kubeApi, String kubeToken, String image, Map values = [:]) {
+def call(String releaseName, String chartRepo, String chartName, String version, String image, Map values = [:]) {
+    def kubeApi =  env.KUBERNETES_API
+    def kubeToken = env.KUBERNETES_TOKEN
+
     container('helm') {
         def helmCommand = "helm install ${releaseName} ${chartRepo}/${chartName} --version ${version} --kube-apiserver ${kubeApi} --kube-token ${kubeToken} --kube-insecure-skip-tls-verify --set image=${image}"
 
diff --git a/vars/dockerBuildAndPush.groovy b/vars/dockerBuildAndPush.groovy
index 1effbd8..6430b46 100644
--- a/vars/dockerBuildAndPush.groovy
+++ b/vars/dockerBuildAndPush.groovy
@@ -1,6 +1,9 @@
-def call(String dockerRepo, String imageName, String dockerfilePath, String buildContext, String nexusUser, String nexusPass) {
+def call(String imageName, String dockerfilePath, String buildContext, String nexusUser) {
+    def dockerRepo = env.NEXUS_DOCKER_URL
+    def nexusPass = env.NEXUS_DOCKER_PASS
+
     container('docker') {
-        sh "dockerd --insecure-registry http://$NEXUS_DOCKER_URL &"
+        sh "dockerd --insecure-registry http://${dockerRepo} &"
         echo "Started Docker daemon"
         sh "docker build -t ${imageName} -f ${dockerfilePath} ${buildContext}"
         echo "Docker image ${imageName} built"
diff --git a/vars/uploadHelmChart.groovy b/vars/uploadHelmChart.groovy
index 8073a18..20d22f1 100644
--- a/vars/uploadHelmChart.groovy
+++ b/vars/uploadHelmChart.groovy
@@ -1,4 +1,6 @@
-def call(String chartFile, String nexusUrl, String nexusUser, String nexusPass) {
+def call(String chartFile, String nexusUser, String nexusPass) {
+    def nexusUrl = env.NEXUS_URL
+
     container('maven') {
         sh "curl -u ${nexusUser}:${nexusPass} --upload-file ${chartFile} ${nexusUrl}"
         echo "Helm chart uploaded: ${chartFile} -> ${nexusUrl}"