From d9d366aad73620679a18503eca3673560f241396 Mon Sep 17 00:00:00 2001
From: konsthol <konsthol@konsthol.eu>
Date: Tue, 27 May 2025 11:23:53 +0300
Subject: [PATCH] Just committing so I can go home

---
 vars/buildAndDeploy.groovy | 52 +++++++++++++++-----------------------
 1 file changed, 20 insertions(+), 32 deletions(-)

diff --git a/vars/buildAndDeploy.groovy b/vars/buildAndDeploy.groovy
index 16a51a5..3629114 100644
--- a/vars/buildAndDeploy.groovy
+++ b/vars/buildAndDeploy.groovy
@@ -1,52 +1,40 @@
 def call(String appName, String helmChartPath, String helmRepoName,String helmChartVersion, String dockerBuildFunction) {
     stage('Make jar') {
-        steps {
-            script {
-                buildJar(true)
-            }
+        script {
+            buildJar(true)
         }
     }
     stage('Package helm chart') {
-        steps {
-            script {
-                makeHelmChart("${helmChartPath}/${appName}")
-            }
+        script {
+            makeHelmChart("${helmChartPath}/${appName}")
         }
     }
     stage('Upload helm chart') {
-        steps {
-            script {
-                uploadHelmChart("${appName}-${helmChartVersion}", env.NEXUS_URL, "admin", env.NEXUS_PASS)
-            }
+        script {
+            uploadHelmChart("${appName}-${helmChartVersion}", env.NEXUS_URL, "admin", env.NEXUS_PASS)
         }
     }
     stage('Docker build & push') {
-        steps {
-            script {
-                this."${dockerBuildFunction}"(env.NEXUS_DOCKER_URL, appName, "./Dockerfile", "target", "admin", env.NEXUS_DOCKER_PASS)
-            }
+        script {
+            this."${dockerBuildFunction}"(env.NEXUS_DOCKER_URL, appName, "./Dockerfile", "target", "admin", env.NEXUS_DOCKER_PASS)
         }
     }
     stage('Add Helm Repo') {
-        steps {
-            script {
-                addHelmRepo(helmRepoName, env.NEXUS_URL)
-            }
+        script {
+            addHelmRepo(helmRepoName, env.NEXUS_URL)
         }
     }
     stage('Deploy Helm Chart') {
-        steps {
-            script {
-                deployHelm(
-                    appName,
-                    helmRepoName,
-                    appName,
-                    helmChartVersion,
-                    env.KUBERNETES_API,
-                    env.KUBERNETES_TOKEN,
-                    ["app.image": "localhost:31050/my-docker-repo/${appName}:latest", "app.ports.http": 8090, "app.secret": "nexus-secret"]
-                )
-            }
+        script {
+            deployHelm(
+                appName,
+                helmRepoName,
+                appName,
+                helmChartVersion,
+                env.KUBERNETES_API,
+                env.KUBERNETES_TOKEN,
+                ["app.image": "localhost:31050/my-docker-repo/${appName}:latest", "app.ports.http": 8090, "app.secret": "nexus-secret"]
+            )
         }
     }
 }