change build for k8s

Dockerfile

@@ -10,7 +10,7 @@ ENV PATH=$CATALINA_HOME/bin:$PATH \
     WORKDIR=$CATALINA_HOME \
     DB_CLUSTER=mongodb
 EXPOSE 8080 8009 2551
-HEALTHCHECK --start-period=120s --interval=15s --timeout=5s --retries=2 CMD healthcheck.sh
+
 ARG repo=prod
 RUN set -x \
            && curl https://repo.infoclinica.ru/yum/centos/sds-${repo}-portal.repo -o /etc/yum.repos.d/sds-${repo}-portal.repo \
@@ -19,7 +19,6 @@ RUN set -x \
            && yum update tzdata -y \
            && yum clean all \
            && chmod +x /opt/tomcat8/bin/entrypoint.sh \
-           && chmod +x /opt/tomcat8/bin/healthcheck.sh \
            && chown -R tomcat:tomcat /etc/web-infoclinic
 
 COPY logging.properties /opt/tomcat8/conf/

healthcheck.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-curl -f 127.0.0.1:8080/login || exit 1

prodK8s.Jenkinsfile

@@ -14,16 +14,17 @@ pipeline {
   environment {
     CLOUD='cloud-it-k8s'
     DOCKER_IMAGE='iru/admin'
-    CHART_PATH='helm/info'
+    CHART_SUBPATH='helm/info'
     NAMESPACE='info'
     HELM_GIT_URL='ssh://git@git.sdsys.ru:8022/iru/k8s.git'
     APP_GIT_URL='ssh://git@git.sdsys.ru:8022/iru/admin.git'
     JENKINS_MAIL='jenkins.dev@sdsys.ru'
     DOCKER_REGISTRY='jcr.infoclinica.ru'
-    CHART_NAME=''
+    RELEASENAME=''
     APP_DIR=''
     HELM_DIR=''
     TAG=''
+    CHART_PATH=''
   }
   parameters {
     string(
@@ -39,6 +40,7 @@ pipeline {
           echo "Pull Repo"
           gitOps.clone(HELM_GIT_URL)
           HELM_DIR = dirOps.calculateDir(HELM_GIT_URL)
+          CHART_PATH = "${HELM_DIR}/${CHART_SUBPATH}"
         }
       }
     }
@@ -47,27 +49,26 @@ pipeline {
         script {
           echo "Update values.yaml"
           APP_DIR = dirOps.calculateDir(APP_GIT_URL)
-          def data = readYaml file: "${HELM_DIR}/${CHART_PATH}/values.yaml"
+          def data = readYaml file: "${CHART_PATH}/values.yaml"
           TAG_PATH = "images.${APP_DIR}.dev"
           TAG = yamlOps.getBuilder(TAG_PATH, data)
           TAG_PATH = "images.${APP_DIR}.prod"
           yamlOps.updateBuilder(TAG_PATH, data, TAG)
-          writeYaml file: "${HELM_DIR}/${CHART_PATH}/values.yaml", data: data, overwrite: true
+          writeYaml file: "${CHART_PATH}/values.yaml", data: data, overwrite: true
         }
       }
     }
     stage("Update APP") {
       steps {
         script {
-          CHART = "${HELM_DIR}/${CHART_PATH}"
-          CHART_NAME = CHART_PATH.split("/")[1]
+          RELEASENAME = CHART_SUBPATH.split("/")[1]
           try {
             echo "Update APP"
-            k8sHelmOps.upgrade(CLOUD, NAMESPACE, CHART_NAME, CHART, 'prod')
+            k8sHelmOps.upgrade(CLOUD, NAMESPACE, RELEASENAME, CHART_PATH, 'dev')
           }
           catch(err) {
             echo "Recovering APP"
-            k8sHelmOps.rollback(CLOUD, NAMESPACE, CHART_NAME)
+            k8sHelmOps.rollback(CLOUD, NAMESPACE, RELEASENAME)
             throw err
           }
         }