Merge branch 'production' of github.com:di2ag/chp_api into production

Author: di2ag-org

deploy/chp-api/Jenkinsfile

@@ -36,7 +36,11 @@ pipeline {
            when { expression { return env.BUILD == 'true' }}
             steps {
                 script {
-                    docker.build(env.DOCKER_REPO_NAME, "--no-cache -f ./Dockerfile ./")
+                    dir('chp_api') {
+                        script {
+                            docker.build(env.DOCKER_REPO_NAME, "--no-cache -f ./Dockerfile ./")
+                        }
+                    }
                     sh 'docker login -u AWS -p $(aws ecr get-login-password --region us-east-1) 853771734544.dkr.ecr.us-east-1.amazonaws.com'
                     docker.image(env.DOCKER_REPO_NAME).push("${BUILD_VERSION}")
                     sh 'cp deploy/chp-api/configs/nginx.conf deploy/chp-api/nginx/'

deploy/chp-api/values.yaml

@@ -80,7 +80,7 @@ ingress:
 
 tolerations: 
   - key: "transltr"
-    value: "managed-app"
+    value: "chp"
     operator: "Equal"
     effect: "NoSchedule"
 
@@ -90,10 +90,10 @@ affinity:
     requiredDuringSchedulingIgnoredDuringExecution:
       - labelSelector:
           matchExpressions:
-          - key: app
+          - key: application
             operator: In
             values:
-            - managed-app
+            - chp
         topologyKey: "kubernetes.io/hostname"
   # this ensures pod only runs on node with label application=managed-app
   nodeAffinity:
@@ -103,4 +103,4 @@ affinity:
           - key: application
             operator: In
             values:
-            - managed-app
+            - chp