From f4ba112ca9a5add6d81d22f61ba2b67c54a93406 Mon Sep 17 00:00:00 2001
From: vzaytsev <vzaytsev@nubes.ru>
Date: Fri, 28 Mar 2025 11:59:24 +0300
Subject: [PATCH] Correct nexus url and set new pass for user. Also add new
 tags to deployment.

---
 build/Jenkinsfile                    | 14 +++++++++-----
 build/helm/templates/deployment.yaml |  2 ++
 build/helm/values.yaml               |  2 +-
 build/vars/build.yaml                |  3 ++-
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/build/Jenkinsfile b/build/Jenkinsfile
index c7e4719..0cc5752 100644
--- a/build/Jenkinsfile
+++ b/build/Jenkinsfile
@@ -37,12 +37,16 @@ node("docker") {
 
             stage("Build image") {
                 println "Start building image ${env.registryContainerName}:${env.version}"
+                if (registryRepoPath) 
+                    env.imageName = "${registryRepoPath}/${env.registryContainerName}"
+                else 
+                    env.imageName = "${env.registryContainerName}"
 
+                app = docker.build("${env.imageName}:${env.version}", "--no-cache -f ./build/Dockerfile .")
 
-                app = docker.build("${env.registryContainerName}:${env.version}", "--no-cache -f ./build/Dockerfile .")
-                
                 println "Start uploading image ${env.registryContainerName}:${env.version} to Nexus"
-                docker.withRegistry("https://${registryUrl}", "nexus-jenkins-cred") {
+
+                docker.withRegistry("https://${registryUrl}/${registryRepoPath}", "registry-jenkins-cred") {
                     app.push("${env.version}")
                     app.push("latest")
                 }
@@ -68,8 +72,8 @@ node("docker") {
                         -f ./helm/values.yaml \
                         ${env.appName} ./helm/
                     """
-                    
-                    sh "kubectl --kubeconfig=auth.config get pods --namespace ${env.namespace}"
+
+                    sh "kubectl --kubeconfig=auth.config get pods --env.namespace ${env.namespace}"
                 }
             }
 
diff --git a/build/helm/templates/deployment.yaml b/build/helm/templates/deployment.yaml
index 3aa5c28..d64ee20 100644
--- a/build/helm/templates/deployment.yaml
+++ b/build/helm/templates/deployment.yaml
@@ -16,6 +16,8 @@ spec:
       labels:
         app: "{{ .Chart.Name }}"
         stand: "{{ .Values.stand }}"
+        contragentCode: 'WZ01112'
+        billingObject: 'None'
     spec:
       {{- if .Values.vault.enabled }}
       serviceAccountName: "{{ .Values.vault.serviceAccountName }}"
diff --git a/build/helm/values.yaml b/build/helm/values.yaml
index 8ae3234..6c1bc38 100644
--- a/build/helm/values.yaml
+++ b/build/helm/values.yaml
@@ -8,7 +8,7 @@ stand: {{ stand }}
 mainContainer:
   ###### Репозиторий
   image:
-    repository: {{ registryUrl }}/{{ registryContainerName }}
+    repository: "{{ registryUrl }}/{{ imageName }}"
     tag: {{ version }}
   containerPort: {{ appPort }}
   ###### Ресурсы
diff --git a/build/vars/build.yaml b/build/vars/build.yaml
index 1bc4180..ade0578 100644
--- a/build/vars/build.yaml
+++ b/build/vars/build.yaml
@@ -1,5 +1,6 @@
 main:
-  registryUrl: "drn.tst.nubes.ru"                         # Где хранится приложение
+  registryUrl: 'registry.ngcloud.ru'                      # Где хранится приложение
+  registryRepoPath: 'deck'                                # Где хранится приложение (registry.ngcloud.ru/deck)
   appName: "svc-api"                                      # наименование контейнера в K8S
   registryContainerName: "deck-{{ appName }}"             # Наименование приложения в Nexus 
   vaultPath: "config.deck-{{ appName }}-{{ stand }}"      # Путь где лежит инфраструктурный kubeconfig для установки Helm-чарта