Tomishinets Vladimir před 4 roky
rodič
revize
26da56bd55
1 změnil soubory, kde provedl 12 přidání a 11 odebrání
  1. 12 11
      devK8s.Jenkinsfile

+ 12 - 11
devK8s.Jenkinsfile

@@ -13,19 +13,19 @@ pipeline {
     }
     }
   }
   }
   environment {
   environment {
-    CLOUD='cloud-it-k8s'
+    CLOUD='kubernetes-office'
     DOCKER_IMAGE='iru/admin'
     DOCKER_IMAGE='iru/admin'
-    CHART_SUBPATH='helm/info'
-    NAMESPACE='info'
+    CHART_SUBPATH='helm/web-registration'
     HELM_GIT_URL='ssh://git@git.sdsys.ru:8022/iru/k8s.git'
     HELM_GIT_URL='ssh://git@git.sdsys.ru:8022/iru/k8s.git'
     APP_GIT_URL='ssh://git@git.sdsys.ru:8022/iru/admin.git'
     APP_GIT_URL='ssh://git@git.sdsys.ru:8022/iru/admin.git'
     JENKINS_MAIL='jenkins.dev@sdsys.ru'
     JENKINS_MAIL='jenkins.dev@sdsys.ru'
-    DOCKER_REGISTRY='jcr.infoclinica.ru'
+    DOCKER_REGISTRY='images.sdsys.ru'
+    NAMESPACE=''
     PROJECT=''
     PROJECT=''
     CHART_NAME=''
     CHART_NAME=''
     CHART_PATH=''
     CHART_PATH=''
     HELM_DIR=''
     HELM_DIR=''
-    TAG=''
+    IMAGE_TO_PUSH=''
   }
   }
   parameters {
   parameters {
     string(
     string(
@@ -47,6 +47,7 @@ pipeline {
           HELM_DIR = dirOps.calculateDir(HELM_GIT_URL)
           HELM_DIR = dirOps.calculateDir(HELM_GIT_URL)
           CHART_PATH = "${HELM_DIR}/${CHART_SUBPATH}"
           CHART_PATH = "${HELM_DIR}/${CHART_SUBPATH}"
           PROJECT = DOCKER_IMAGE.split("/")[1]
           PROJECT = DOCKER_IMAGE.split("/")[1]
+          NAMESPACE = CHART_SUBPATH.split("/")[1]
         }
         }
       }
       }
     }
     }
@@ -56,8 +57,8 @@ pipeline {
           echo "Build Image with Kaniko"
           echo "Build Image with Kaniko"
           REGISTRY = "${DOCKER_REGISTRY}/${DOCKER_IMAGE}"
           REGISTRY = "${DOCKER_REGISTRY}/${DOCKER_IMAGE}"
           ARGS = [ "repo=${repo}" ]
           ARGS = [ "repo=${repo}" ]
-          TAG = "${repo}-${BUILD_NUMBER}"
-          k8sBuildImage.kaniko(REGISTRY, TAG, ARGS)
+          IMAGE_TO_PUSH = "${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${repo}-${BUILD_NUMBER}"
+          k8sBuildImage.kaniko(REGISTRY, IMAGE_TO_PUSH, ARGS)
         }
         }
       }
       }
     }
     }
@@ -65,10 +66,10 @@ pipeline {
       steps {
       steps {
         script {
         script {
           echo "Update Helm Chart"
           echo "Update Helm Chart"
-          def data = readYaml file: "${CHART_PATH}/values.yaml"
-          TAG_PATH = "images.${PROJECT}.dev"
-          yamlOps.updateBuilder(TAG_PATH, data, TAG)
-          writeYaml file: "${CHART_PATH}/values.yaml", data: data, overwrite: true
+          def data = readYaml file: "${CHART_PATH}/dev.yaml"
+          TAG_PATH = "images.${PROJECT}"
+          yamlOps.updateBuilder(TAG_PATH, data, IMAGE_TO_PUSH)
+          writeYaml file: "${CHART_PATH}/dev.yaml", data: data, overwrite: true
         }
         }
       }
       }
     }
     }