From 6e129c3a144cf4acaf893efe95c9ce341d9e1584 Mon Sep 17 00:00:00 2001
From: vzaytsev <vzaytsev@nubes.ru>
Date: Tue, 5 Nov 2024 10:19:15 +0300
Subject: [PATCH] change build way

---
 build/Jenkinsfile            |  5 +++-
 build/microservice.yaml.tmpl | 47 ++++++++++++++++++------------------
 2 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/build/Jenkinsfile b/build/Jenkinsfile
index 82932f8..70bcc28 100644
--- a/build/Jenkinsfile
+++ b/build/Jenkinsfile
@@ -11,8 +11,11 @@ node("docker") {
             stage("Prepare environments") {
                 if (env.BRANCH_NAME == 'master') 
                     env.stand = "prod"
-                else if (env.BRANCH_NAME == 'dev')
+                else if (env.BRANCH_NAME == 'dev') {
                     env.stand = "test"
+                    // временно для этого микросервиса
+                    env.namespace = "${env.namespace}-test"
+                }
                 else
                     error("Unsupported branch: ${env.BRANCH_NAME}")
                 
diff --git a/build/microservice.yaml.tmpl b/build/microservice.yaml.tmpl
index 1e66e49..0a8ce31 100644
--- a/build/microservice.yaml.tmpl
+++ b/build/microservice.yaml.tmpl
@@ -95,26 +95,27 @@ spec:
     protocol: TCP
   selector:
     app: {{ appName }}
----
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: {{ appName }}
-  namespace: {{ namespace }}
-spec:
-  ingressClassName: nginx
-  rules:
-  - host: {{ domainName }}
-    http:
-      paths:
-      - backend:
-          service:
-            name: {{ appName }}
-            port:
-              number: {{ appPort }}
-        path: /
-        pathType: Prefix
-  tls:
-  - hosts:
-    - {{ domainName }}
-    secretName: api-deck-tls
+    
+# ---
+# apiVersion: networking.k8s.io/v1
+# kind: Ingress
+# metadata:
+#   name: {{ appName }}
+#   namespace: {{ namespace }}
+# spec:
+#   ingressClassName: nginx
+#   rules:
+#   - host: {{ domainName }}
+#     http:
+#       paths:
+#       - backend:
+#           service:
+#             name: {{ appName }}
+#             port:
+#               number: {{ appPort }}
+#         path: /
+#         pathType: Prefix
+#   tls:
+#   - hosts:
+#     - {{ domainName }}
+#     secretName: api-deck-tls