@codefresh-io/kube-integration 1.23.8 → 1.23.9

package/.deploy/kube-integration/templates/_kube-integration-deployment.tpl

@@ -113,6 +113,8 @@ spec:
           value: {{ default (printf "%s-%s" .Release.Name .Values.global.postgresService) .Values.global.postgresHostname | quote }}
         - name: POSTGRES_DATABASE
           value: {{ .Values.global.postgresDatabase }}
+        - name: POSTGRES_PORT
+          value: {{ .Values.global.postgresPort | quote }}
         - name: POSTGRES_USER
           valueFrom:
             secretKeyRef:
@@ -134,6 +136,10 @@ spec:
           value: {{ template "kube-integration.name" . }}
         - name: FORMAT_LOGS_TO_ELK
           value: "{{ .Values.formatLogsToElk }}"
+        {{- if $.Values.global.mongoTLS }}
+        - name: MTLS_CERT_PATH
+          value: /etc/ssl/mongodb/ca.pem
+        {{- end }}
         ports:
         - containerPort: {{ .Values.targetPort }}
           protocol: TCP
@@ -154,16 +160,28 @@ spec:
           failureThreshold: 3
           initialDelaySeconds: 30
           timeoutSeconds: 10
-      {{- if .Values.global.addResolvConf }}
         volumeMounts:
+          {{- if .Values.global.addResolvConf }}
           - mountPath: /etc/resolv.conf
             name: resolvconf
             subPath: resolv.conf
             readOnly: true
+          {{- end }}  
+          {{- if $.Values.global.mongoTLS }} 
+          - mountPath: /etc/ssl/mongodb/
+            name: mongodb-tls
+            readOnly: true
+          {{- end }}
       volumes:
+        {{- if .Values.global.addResolvConf }}
         - name: resolvconf
           configMap:
             name: {{ .Release.Name }}-{{ .Values.global.codefresh }}-resolvconf
-      {{- end }}
+        {{- end }}
+        {{- if $.Values.global.mongoTLS }}    
+        - name: mongodb-tls
+          secret:
+            secretName: {{ $.Release.Name }}-{{ $.Values.global.codefresh }}-mongodb-tls
+        {{- end }}
       restartPolicy: Always
 {{- end }}

package/.deploy/kube-integration/values.yaml

@@ -13,9 +13,9 @@ imagePullPolicy: Always
 replicaCount: 1
 redeploy: false
 
-image: codefresh/kube-integration
+image: codefresh-inc/codefresh/kube-integration
 imageTag: master
-dockerRegistry: gcr.io/codefresh-inc/
+dockerRegistry: 839151377425.dkr.ecr.us-east-1.amazonaws.com/
 
 # Service type (ClusterIP, NodePort, LoadBalancer)
 #serviceType: ClusterIP

package/config/index.js

@@ -1,15 +1,15 @@
 'use strict';
 
-const _    = require('lodash');
 const path = require('path');
-const os   = require('os');
+const os = require('os');
+const fs = require('fs');
 const { getRequestId, getAuthenticatedEntity } = require('@codefresh-io/http-infra');
 
 const name = 'kube-integration';
 
 const base = {};
 
-base.env  = process.env.NODE_ENV || 'kubernetes';
+base.env = process.env.NODE_ENV || 'kubernetes';
 base.port = process.env.PORT || 9003;
 base.name = name;
 
@@ -36,8 +36,8 @@ base.logger = {
             }
             // human readable format
             return `${options.timestamp()} ${options.level.toUpperCase()} >> ` +
-            `${options.message || ''}` +
-            `${options.meta && Object.keys(options.meta).length ? ` << ${JSON.stringify(options.meta)}` : ''}`;
+                `${options.message || ''}` +
+                `${options.meta && Object.keys(options.meta).length ? ` << ${JSON.stringify(options.meta)}` : ''}`;
         }
     },
     basePath: null,
@@ -74,8 +74,10 @@ base.newrelic = {
 
 base.mongo = {
     uri: process.env.MONGO_URI || 'mongodb://codefresh.dev:27017/kube',
-    reconnectTries: process.env.MONGO_RECONNECT_TRIES || Number.MAX_VALUE,
-    reconnectInterval: process.env.MONGO_RECONNECT_INTERVAL || 30 * 1000
+    options: {
+        reconnectTries: process.env.MONGO_RECONNECT_TRIES || Number.MAX_VALUE,
+        reconnectInterval: process.env.MONGO_RECONNECT_INTERVAL || 30 * 1000
+    }
 };
 
 base.eventbus = {
@@ -88,14 +90,20 @@ base.postgres = {
     host: process.env.POSTGRES_HOST || 'codefresh.dev',
     database: process.env.POSTGRES_DATABASE || 'postgres',
     user: process.env.POSTGRES_USER || 'postgres',
-    password: process.env.POSTGRES_PASSWORD || 'postgres'
+    password: process.env.POSTGRES_PASSWORD || 'postgres',
+    port: process.env.POSTGRES_PORT || 5432
 };
 
 base.helm = {
     maxHelmHistorySize: process.env.MAX_HELM_HISTORY_SIZE, // If set, limits history in release
 };
 
-require(`./environment/kubernetes`)(base);
+if (process.env.MTLS_CERT_PATH) {
+    const credentials = fs.readFileSync(process.env.MTLS_CERT_PATH);
+    base.mongo.options.sslKey = credentials;
+    base.mongo.options.sslCert = credentials;
+}
 
+require(`./environment/kubernetes`)(base);
 
 module.exports = base;

package/index.js

@@ -18,4 +18,3 @@ function start(){
         require('./infra').init();
     }
 }
-

package/infra/eventbus.js

@@ -38,7 +38,8 @@ class Eventbus {
                         host: this.config.postgres.host,
                         database: this.config.postgres.database,
                         user: this.config.postgres.user,
-                        password: this.config.postgres.password
+                        password: this.config.postgres.password,
+                        port: this.config.postgres.port,
                     },
                     microServiceName: this.config.eventbus.serviceName
                 });
@@ -100,4 +101,4 @@ class Eventbus {
 }
 
 
-module.exports = new Eventbus();
+module.exports = new Eventbus();

package/infra/mongo.js

@@ -19,8 +19,7 @@ class Mongo {
     init(config) {
         console.log(`Conncting to mongo uri: ${config.mongo.uri}`);
         return mongoose.connect(config.mongo.uri, {
-            reconnectTries: config.mongo.reconnectTries,
-            reconnectInterval: config.mongo.reconnectInterval,
+            ...config.mongo.options,
             autoReconnect: true
         }).then(() => {
             console.log(`Mongoose connected to: ${config.mongo.uri}`);

package/lib/helm/release/base/revision.js

@@ -5,7 +5,7 @@ class BaseRevision {
     }
     getCommitMessage() {
         return this._getNormalizedTemplates()
-            .then(tpl => tpl.find(name => name === 'templates/NOTES.txt'))
+            .then(tpl => tpl.find(name => 'templates/NOTES.txt'))
             .then((content) => {
                 if (!content) {
                     return '';

package/lib/helm/release/tests/revision.unit.spec.js

@@ -50,6 +50,127 @@ describe('revision', () => {
         expect(r).to.have.all.keys(['_name', '_createdAt', '_modifiedAt', '_rawData', '_status', '_version']);
     });
 
+    it('should get commit message for revision', async () => {
+        const r = new Revision({
+            NAME: 'release-name',
+            STATUS: 'DEPLOYED',
+            VERSION: '1',
+            MODIFIED_AT: 'some-time',
+            CREATED_AT: 'some-time',
+            dataAsBase64: ''
+        });
+        r._setDecodedObject({
+            "name": "tomcat",
+            "info": {
+                "first_deployed": "2021-11-11T12:41:43.664250115Z",
+                "last_deployed": "2022-01-27T09:50:29.752777998Z",
+                "deleted": "",
+                "description": "Upgrade complete",
+                "status": "deployed",
+                "notes": "1. Get the application URL by running these commands:\n     NOTE: It may take a few minutes for the LoadBalancer IP to be available.\n           You can watch the status of by running 'kubectl get svc -w tomcat'\n  export SERVICE_IP=$(kubectl get svc --namespace default tomcat -o jsonpath='{.status.loadBalancer.ingress[0].hostname}')\n  echo http://$SERVICE_IP:\ncommit_message:test\n"
+            },
+            "chart": {
+                "metadata": {
+                    "name": "tomcat",
+                    "home": "https://github.com/yahavb",
+                    "version": "0.4.3",
+                    "description": "DEPRECATED - Deploy a basic tomcat application server with sidecar as web archive container",
+                    "icon": "http://tomcat.apache.org/res/images/tomcat.png",
+                    "apiVersion": "v1",
+                    "appVersion": "7.0",
+                    "deprecated": true
+                },
+                "lock": null,
+                "templatesList": [
+                    {
+                        "name": "templates/NOTES.txt",
+                        "data": "MS4gR2V0IHRoZSBhcHBsaWNhdGlvbiBVUkwgYnkgcnVubmluZyB0aGVzZSBjb21tYW5kczoKe3stIGlmIC5WYWx1ZXMuaW5ncmVzcy5lbmFibGVkIH19Cnt7LSByYW5nZSAuVmFsdWVzLmluZ3Jlc3MuaG9zdHMgfX0KICBodHRwe3sgaWYgJC5WYWx1ZXMuaW5ncmVzcy50bHMgfX1ze3sgZW5kIH19Oi8ve3sgLiB9fXt7ICQuVmFsdWVzLmluZ3Jlc3MucGF0aCB9fQp7ey0gZW5kIH19Cnt7LSBlbHNlIGlmIGNvbnRhaW5zICJOb2RlUG9ydCIgLlZhbHVlcy5zZXJ2aWNlLnR5cGUgfX0KICBleHBvcnQgTk9ERV9QT1JUPSQoa3ViZWN0bCBnZXQgLS1uYW1lc3BhY2Uge3sgLlJlbGVhc2UuTmFtZXNwYWNlIH19IC1vIGpzb25wYXRoPSJ7LnNwZWMucG9ydHNbMF0ubm9kZVBvcnR9IiBzZXJ2aWNlcyB7eyB0ZW1wbGF0ZSAidG9tY2F0LmZ1bGxuYW1lIiAuIH19KQogIGV4cG9ydCBOT0RFX0lQPSQoa3ViZWN0bCBnZXQgbm9kZXMgLS1uYW1lc3BhY2Uge3sgLlJlbGVhc2UuTmFtZXNwYWNlIH19IC1vIGpzb25wYXRoPSJ7Lml0ZW1zWzBdLnN0YXR1cy5hZGRyZXNzZXNbMF0uYWRkcmVzc30iKQogIGVjaG8gaHR0cDovLyROT0RFX0lQOiROT0RFX1BPUlQKe3stIGVsc2UgaWYgY29udGFpbnMgIkxvYWRCYWxhbmNlciIgLlZhbHVlcy5zZXJ2aWNlLnR5cGUgfX0KICAgICBOT1RFOiBJdCBtYXkgdGFrZSBhIGZldyBtaW51dGVzIGZvciB0aGUgTG9hZEJhbGFuY2VyIElQIHRvIGJlIGF2YWlsYWJsZS4KICAgICAgICAgICBZb3UgY2FuIHdhdGNoIHRoZSBzdGF0dXMgb2YgYnkgcnVubmluZyAna3ViZWN0bCBnZXQgc3ZjIC13IHt7IHRlbXBsYXRlICJ0b21jYXQuZnVsbG5hbWUiIC4gfX0nCiAgZXhwb3J0IFNFUlZJQ0VfSVA9JChrdWJlY3RsIGdldCBzdmMgLS1uYW1lc3BhY2Uge3sgLlJlbGVhc2UuTmFtZXNwYWNlIH19IHt7IHRlbXBsYXRlICJ0b21jYXQuZnVsbG5hbWUiIC4gfX0gLW8ganNvbnBhdGg9J3suc3RhdHVzLmxvYWRCYWxhbmNlci5pbmdyZXNzWzBdLmhvc3RuYW1lfScpCiAgZWNobyBodHRwOi8vJFNFUlZJQ0VfSVA6e3sgLlZhbHVlcy5zZXJ2aWNlLnBvcnQgfX0Ke3stIGVsc2UgaWYgY29udGFpbnMgIkNsdXN0ZXJJUCIgLlZhbHVlcy5zZXJ2aWNlLnR5cGUgfX0KICBleHBvcnQgUE9EX05BTUU9JChrdWJlY3RsIGdldCBwb2RzIC0tbmFtZXNwYWNlIHt7IC5SZWxlYXNlLk5hbWVzcGFjZSB9fSAtbCAiYXBwPXt7IHRlbXBsYXRlICJ0b21jYXQubmFtZSIgLiB9fSxyZWxlYXNlPXt7IC5SZWxlYXNlLk5hbWUgfX0iIC1vIGpzb25wYXRoPSJ7Lml0ZW1zWzBdLm1ldGFkYXRhLm5hbWV9IikKICBlY2hvICJWaXNpdCBodHRwOi8vMTI3LjAuMC4xOjgwODAgdG8gdXNlIHlvdXIgYXBwbGljYXRpb24iCiAga3ViZWN0bCBwb3J0LWZvcndhcmQgJFBPRF9OQU1FIDgwODA6ODAKe3stIGVuZCB9fQpjb21taXRfbWVzc2FnZTp0ZXN0Cg=="
+                    },
+                    {
+                        "name": "templates/_helpers.tpl",
+                        "data": "e3svKiB2aW06IHNldCBmaWxldHlwZT1tdXN0YWNoZTogKi99fQp7ey8qCkV4cGFuZCB0aGUgbmFtZSBvZiB0aGUgY2hhcnQuCiovfX0Ke3stIGRlZmluZSAidG9tY2F0Lm5hbWUiIC19fQp7ey0gZGVmYXVsdCAuQ2hhcnQuTmFtZSAuVmFsdWVzLm5hbWVPdmVycmlkZSB8IHRydW5jIDYzIHwgdHJpbVN1ZmZpeCAiLSIgLX19Cnt7LSBlbmQgLX19Cgp7ey8qCkNyZWF0ZSBhIGRlZmF1bHQgZnVsbHkgcXVhbGlmaWVkIGFwcCBuYW1lLgpXZSB0cnVuY2F0ZSBhdCA2MyBjaGFycyBiZWNhdXNlIHNvbWUgS3ViZXJuZXRlcyBuYW1lIGZpZWxkcyBhcmUgbGltaXRlZCB0byB0aGlzIChieSB0aGUgRE5TIG5hbWluZyBzcGVjKS4KSWYgcmVsZWFzZSBuYW1lIGNvbnRhaW5zIGNoYXJ0IG5hbWUgaXQgd2lsbCBiZSB1c2VkIGFzIGEgZnVsbCBuYW1lLgoqL319Cnt7LSBkZWZpbmUgInRvbWNhdC5mdWxsbmFtZSIgLX19Cnt7LSBpZiAuVmFsdWVzLmZ1bGxuYW1lT3ZlcnJpZGUgLX19Cnt7LSAuVmFsdWVzLmZ1bGxuYW1lT3ZlcnJpZGUgfCB0cnVuYyA2MyB8IHRyaW1TdWZmaXggIi0iIC19fQp7ey0gZWxzZSAtfX0Ke3stICRuYW1lIDo9IGRlZmF1bHQgLkNoYXJ0Lk5hbWUgLlZhbHVlcy5uYW1lT3ZlcnJpZGUgLX19Cnt7LSBpZiBjb250YWlucyAkbmFtZSAuUmVsZWFzZS5OYW1lIC19fQp7ey0gLlJlbGVhc2UuTmFtZSB8IHRydW5jIDYzIHwgdHJpbVN1ZmZpeCAiLSIgLX19Cnt7LSBlbHNlIC19fQp7ey0gcHJpbnRmICIlcy0lcyIgLlJlbGVhc2UuTmFtZSAkbmFtZSB8IHRydW5jIDYzIHwgdHJpbVN1ZmZpeCAiLSIgLX19Cnt7LSBlbmQgLX19Cnt7LSBlbmQgLX19Cnt7LSBlbmQgLX19Cgp7ey8qCkNyZWF0ZSBjaGFydCBuYW1lIGFuZCB2ZXJzaW9uIGFzIHVzZWQgYnkgdGhlIGNoYXJ0IGxhYmVsLgoqL319Cnt7LSBkZWZpbmUgInRvbWNhdC5jaGFydCIgLX19Cnt7LSBwcmludGYgIiVzLSVzIiAuQ2hhcnQuTmFtZSAuQ2hhcnQuVmVyc2lvbiB8IHJlcGxhY2UgIisiICJfIiB8IHRydW5jIDYzIHwgdHJpbVN1ZmZpeCAiLSIgLX19Cnt7LSBlbmQgLX19Cg=="
+                    },
+                    {
+                        "name": "templates/appsrv-svc.yaml",
+                        "data": "YXBpVmVyc2lvbjogdjEKa2luZDogU2VydmljZQptZXRhZGF0YToKICBuYW1lOiB7eyB0ZW1wbGF0ZSAidG9tY2F0LmZ1bGxuYW1lIiAuIH19CiAgbGFiZWxzOgogICAgYXBwOiB7eyB0ZW1wbGF0ZSAidG9tY2F0Lm5hbWUiIC4gfX0KICAgIGNoYXJ0OiB7eyB0ZW1wbGF0ZSAidG9tY2F0LmNoYXJ0IiAuIH19CiAgICByZWxlYXNlOiB7eyAuUmVsZWFzZS5OYW1lIH19CiAgICBoZXJpdGFnZToge3sgLlJlbGVhc2UuU2VydmljZSB9fQpzcGVjOgogIHR5cGU6IHt7IC5WYWx1ZXMuc2VydmljZS50eXBlIH19CiAgcG9ydHM6CiAgICAtIHBvcnQ6IHt7IC5WYWx1ZXMuc2VydmljZS5leHRlcm5hbFBvcnQgfX0KICAgICAgdGFyZ2V0UG9ydDoge3sgLlZhbHVlcy5zZXJ2aWNlLmludGVybmFsUG9ydCB9fQogICAgICBwcm90b2NvbDogVENQCiAgICAgIG5hbWU6IHt7IC5WYWx1ZXMuc2VydmljZS5uYW1lIH19CiAgc2VsZWN0b3I6CiAgICBhcHA6IHt7IHRlbXBsYXRlICJ0b21jYXQubmFtZSIgLiB9fQogICAgcmVsZWFzZToge3sgLlJlbGVhc2UuTmFtZSB9fQo="
+                    },
+                    {
+                        "name": "templates/appsrv.yaml",
+                        "data": "YXBpVmVyc2lvbjogYXBwcy92MQpraW5kOiBEZXBsb3ltZW50Cm1ldGFkYXRhOgogIG5hbWU6IHt7IHRlbXBsYXRlICJ0b21jYXQuZnVsbG5hbWUiIC4gfX0KICBsYWJlbHM6CiAgICBhcHA6IHt7IHRlbXBsYXRlICJ0b21jYXQubmFtZSIgLiB9fQogICAgY2hhcnQ6IHt7IHRlbXBsYXRlICJ0b21jYXQuY2hhcnQiIC4gfX0KICAgIHJlbGVhc2U6IHt7IC5SZWxlYXNlLk5hbWUgfX0KICAgIGhlcml0YWdlOiB7eyAuUmVsZWFzZS5TZXJ2aWNlIH19CnNwZWM6CiAgcmVwbGljYXM6IHt7IC5WYWx1ZXMucmVwbGljYUNvdW50IH19CiAgc2VsZWN0b3I6CiAgICBtYXRjaExhYmVsczoKICAgICAgYXBwOiB7eyB0ZW1wbGF0ZSAidG9tY2F0Lm5hbWUiIC4gfX0KICAgICAgcmVsZWFzZToge3sgLlJlbGVhc2UuTmFtZSB9fQogIHRlbXBsYXRlOgogICAgbWV0YWRhdGE6CiAgICAgIGxhYmVsczoKICAgICAgICBhcHA6IHt7IHRlbXBsYXRlICJ0b21jYXQubmFtZSIgLiB9fQogICAgICAgIHJlbGVhc2U6IHt7IC5SZWxlYXNlLk5hbWUgfX0KICAgIHNwZWM6CiAgICAgIHZvbHVtZXM6CiAgICAgICAgLSBuYW1lOiBhcHAtdm9sdW1lCiAgICAgICAgICBlbXB0eURpcjoge30KICAgICAgICB7ey0gd2l0aCAuVmFsdWVzLmV4dHJhVm9sdW1lcyB9fQp7eyB0b1lhbWwgLiB8IGluZGVudCA4IH19CiAgICAgICAge3stIGVuZCB9fQogICAgICBpbml0Q29udGFpbmVyczoKICAgICAgICAtIG5hbWU6IHdhcgogICAgICAgICAgaW1hZ2U6IHt7IC5WYWx1ZXMuaW1hZ2Uud2ViYXJjaGl2ZS5yZXBvc2l0b3J5IH19Ont7IC5WYWx1ZXMuaW1hZ2Uud2ViYXJjaGl2ZS50YWcgfX0KICAgICAgICAgIGltYWdlUHVsbFBvbGljeToge3sgLlZhbHVlcy5pbWFnZS5wdWxsUG9saWN5IH19CiAgICAgICAgICBjb21tYW5kOgogICAgICAgICAgICAtICJzaCIKICAgICAgICAgICAgLSAiLWMiCiAgICAgICAgICAgIC0gImNwIC8qLndhciAvYXBwIgogICAgICAgICAgdm9sdW1lTW91bnRzOgogICAgICAgICAgICAtIG5hbWU6IGFwcC12b2x1bWUKICAgICAgICAgICAgICBtb3VudFBhdGg6IC9hcHAKICAgICAgICB7ey0gd2l0aCAuVmFsdWVzLmV4dHJhSW5pdENvbnRhaW5lcnMgfX0Ke3sgdG9ZYW1sIC4gfCBpbmRlbnQgOCB9fQogICAgICAgIHt7LSBlbmQgfX0KCiAgICAgIGNvbnRhaW5lcnM6CiAgICAgICAgLSBuYW1lOiB7eyAuQ2hhcnQuTmFtZSB9fQogICAgICAgICAgaW1hZ2U6IHt7IC5WYWx1ZXMuaW1hZ2UudG9tY2F0LnJlcG9zaXRvcnkgfX06e3sgLlZhbHVlcy5pbWFnZS50b21jYXQudGFnIH19CiAgICAgICAgICBpbWFnZVB1bGxQb2xpY3k6IHt7IC5WYWx1ZXMuaW1hZ2UucHVsbFBvbGljeSB9fQogICAgICAgICAge3stIHdpdGggLlZhbHVlcy5lbnYgfX0KICAgICAgICAgIGVudjoKe3sgdG9ZYW1sIC4gfCBpbmRlbnQgMTIgfX0KICAgICAgICAgIHt7LSBlbmQgfX0KICAgICAgICAgIHZvbHVtZU1vdW50czoKICAgICAgICAgICAgLSBuYW1lOiBhcHAtdm9sdW1lCiAgICAgICAgICAgICAgbW91bnRQYXRoOiB7eyAuVmFsdWVzLmRlcGxveS5kaXJlY3RvcnkgfX0KICAgICAgICAgICAge3stIHdpdGggLlZhbHVlcy5leHRyYVZvbHVtZU1vdW50cyB9fQp7eyB0b1lhbWwgLiB8IGluZGVudCAxMiB9fQogICAgICAgICAgICB7ey0gZW5kIH19CiAgICAgICAgICBwb3J0czoKICAgICAgICAgICAgLSBjb250YWluZXJQb3J0OiB7eyAuVmFsdWVzLnNlcnZpY2UuaW50ZXJuYWxQb3J0IH19CiAgICAgICAgICAgICAge3stIHdpdGggLlZhbHVlcy5ob3N0UG9ydCB9fQogICAgICAgICAgICAgIGhvc3RQb3J0OiB7eyAuIH19CiAgICAgICAgICAgICAge3stIGVuZCB9fQogICAgICAgICAgbGl2ZW5lc3NQcm9iZToKICAgICAgICAgICAgaHR0cEdldDoKICAgICAgICAgICAgICBwYXRoOiB7eyAuVmFsdWVzLmxpdmVuZXNzUHJvYmUucGF0aCB9fQogICAgICAgICAgICAgIHBvcnQ6IHt7IC5WYWx1ZXMuc2VydmljZS5pbnRlcm5hbFBvcnQgfX0KICAgICAgICAgICAgaW5pdGlhbERlbGF5U2Vjb25kczoge3sgLlZhbHVlcy5saXZlbmVzc1Byb2JlLmluaXRpYWxEZWxheVNlY29uZHMgfX0KICAgICAgICAgICAgcGVyaW9kU2Vjb25kczoge3sgLlZhbHVlcy5saXZlbmVzc1Byb2JlLnBlcmlvZFNlY29uZHMgfX0KICAgICAgICAgICAgZmFpbHVyZVRocmVzaG9sZDoge3sgLlZhbHVlcy5saXZlbmVzc1Byb2JlLmZhaWx1cmVUaHJlc2hvbGQgfX0KICAgICAgICAgICAgdGltZW91dFNlY29uZHM6IHt7IC5WYWx1ZXMubGl2ZW5lc3NQcm9iZS50aW1lb3V0U2Vjb25kcyB9fQogICAgICAgICAgcmVhZGluZXNzUHJvYmU6CiAgICAgICAgICAgIGh0dHBHZXQ6CiAgICAgICAgICAgICAgcGF0aDoge3sgLlZhbHVlcy5yZWFkaW5lc3NQcm9iZS5wYXRoIH19CiAgICAgICAgICAgICAgcG9ydDoge3sgLlZhbHVlcy5zZXJ2aWNlLmludGVybmFsUG9ydCB9fQogICAgICAgICAgICBpbml0aWFsRGVsYXlTZWNvbmRzOiB7eyAuVmFsdWVzLnJlYWRpbmVzc1Byb2JlLmluaXRpYWxEZWxheVNlY29uZHMgfX0KICAgICAgICAgICAgcGVyaW9kU2Vjb25kczoge3sgLlZhbHVlcy5yZWFkaW5lc3NQcm9iZS5wZXJpb2RTZWNvbmRzIH19CiAgICAgICAgICAgIGZhaWx1cmVUaHJlc2hvbGQ6IHt7IC5WYWx1ZXMucmVhZGluZXNzUHJvYmUuZmFpbHVyZVRocmVzaG9sZCB9fQogICAgICAgICAgICB0aW1lb3V0U2Vjb25kczoge3sgLlZhbHVlcy5yZWFkaW5lc3NQcm9iZS50aW1lb3V0U2Vjb25kcyB9fQogICAgICAgICAgcmVzb3VyY2VzOgp7eyB0b1lhbWwgLlZhbHVlcy5yZXNvdXJjZXMgfCBpbmRlbnQgMTIgfX0KICAgIHt7LSBpZiAuVmFsdWVzLmltYWdlLnB1bGxTZWNyZXRzIH19CiAgICAgIGltYWdlUHVsbFNlY3JldHM6Cnt7IHRvWWFtbCAuVmFsdWVzLmltYWdlLnB1bGxTZWNyZXRzIHwgaW5kZW50IDggfX0KICAgIHt7LSBlbmQgfX0KICAgIHt7LSBpZiAuVmFsdWVzLm5vZGVTZWxlY3RvciB9fQogICAgICBub2RlU2VsZWN0b3I6Cnt7IHRvWWFtbCAuVmFsdWVzLm5vZGVTZWxlY3RvciB8IGluZGVudCA4IH19CiAgICB7ey0gZW5kIH19CiAgICB7ey0gaWYgLlZhbHVlcy50b2xlcmF0aW9ucyB9fQogICAgICB0b2xlcmF0aW9uczoKe3sgdG9ZYW1sIC5WYWx1ZXMudG9sZXJhdGlvbnMgfCBpbmRlbnQgOCB9fQogICAge3stIGVuZCB9fQo="
+                    }
+                ],
+                "values": {
+                    "affinity": {},
+                    "deploy": {
+                        "directory": "/usr/local/tomcat/webapps"
+                    },
+                    "env": [],
+                    "extraInitContainers": [],
+                    "extraVolumeMounts": [],
+                    "extraVolumes": [],
+                    "hostPort": 8009,
+                    "image": {
+                        "pullPolicy": "IfNotPresent",
+                        "pullSecrets": [],
+                        "tomcat": {
+                            "repository": "tomcat",
+                            "tag": "7.0"
+                        },
+                        "webarchive": {
+                            "repository": "ananwaresystems/webarchive",
+                            "tag": "1.0"
+                        }
+                    },
+                    "ingress": {
+                        "annotations": {},
+                        "enabled": false,
+                        "hosts": [
+                            "chart-example.local"
+                        ],
+                        "path": "/",
+                        "tls": []
+                    },
+                    "livenessProbe": {
+                        "failureThreshold": 6,
+                        "initialDelaySeconds": 60,
+                        "path": "/sample",
+                        "periodSeconds": 30,
+                        "timeoutSeconds": 5
+                    },
+                    "nodeSelector": {},
+                    "readinessProbe": {
+                        "failureThreshold": 6,
+                        "initialDelaySeconds": 60,
+                        "path": "/sample",
+                        "periodSeconds": 30,
+                        "timeoutSeconds": 5
+                    },
+                    "replicaCount": 1,
+                    "resources": {},
+                    "service": {
+                        "externalPort": 80,
+                        "internalPort": 8080,
+                        "name": "http",
+                        "type": "LoadBalancer"
+                    },
+                    "tolerations": []
+                },
+                "schema": null,
+                "files": [
+                    {
+                        "name": "README.md",
+                        "data": "IyDimqDvuI8gUmVwbyBBcmNoaXZlIE5vdGljZQoKQXMgb2YgTm92IDEzLCAyMDIwLCBjaGFydHMgaW4gdGhpcyByZXBvIHdpbGwgbm8gbG9uZ2VyIGJlIHVwZGF0ZWQuCkZvciBtb3JlIGluZm9ybWF0aW9uLCBzZWUgdGhlIEhlbG0gQ2hhcnRzIFtEZXByZWNhdGlvbiBhbmQgQXJjaGl2ZSBOb3RpY2VdKGh0dHBzOi8vZ2l0aHViLmNvbS9oZWxtL2NoYXJ0cyMlRUYlQjglOEYtZGVwcmVjYXRpb24tYW5kLWFyY2hpdmUtbm90aWNlKSwgYW5kIFtVcGRhdGVdKGh0dHBzOi8vaGVsbS5zaC9ibG9nL2NoYXJ0cy1yZXBvLWRlcHJlY2F0aW9uLykuCgojIFRvbWNhdAoKW1RvbWNhdF0oaHR0cDovL3RvbWNhdC5hcGFjaGUub3JnKSBpcyBpcyBhbiBvcGVuIHNvdXJjZSBpbXBsZW1lbnRhdGlvbiBvZiB0aGUgSmF2YSBTZXJ2bGV0LCBKYXZhU2VydmVyIFBhZ2VzLCBKYXZhIEV4cHJlc3Npb24gTGFuZ3VhZ2UgYW5kIEphdmEgV2ViU29ja2V0IHRlY2hub2xvZ2llcy4KCiMjIERFUFJFQ0FUSU9OIE5PVElDRQoKVGhpcyBjaGFydCBpcyBkZXByZWNhdGVkIGFuZCBubyBsb25nZXIgc3VwcG9ydGVkLgoKIyMgSW50cm9kdWN0aW9uCgpUaGlzIGNoYXJ0IGNyZWF0ZXMgYSBbdG9tY2F0IGFwcGxpY2F0aW9uIHNlcnZlcl0oaHR0cDovL3RvbWNhdC5hcGFjaGUub3JnKSBEZXBsb3ltZW50LCBwbHVzIGh0dHAgU2VydmljZXMgZm9yIHRoZSBzZXJ2ZXIuClRoZSBjaGFydCBvZmZlcnMgYW4gb3B0aW1pemF0aW9uIGZvciBhcHBsaWNhdGlvbiB1cGRhdGVzIHJ1bm5pbmcgaW4gYSBzZXJ2bGV0IGNvbnRhaW5lci10eXBlIGVuZ2luZXMgbGlrZSB0b21jYXQgYW5kIFtKYm9zc10oaHR0cDovL2pib3NzYXMuamJvc3Mub3JnKS4gVGhlIGNoYXJ0IHVzZXMgdGhlIFdBUiwgRUFSLCBhbmQgb3RoZXIgZGVwbG95YWJsZSBjb21wb25lbnRzIG91dHNpZGUgb2YgdGhlIFNlcnZsZXQgZW5naW5lIGFzIHNpZGVjYXIgY29udGFpbmVyIHNvIGFwcGxpY2F0aW9uIHVwZ3JhZGVzIHJlcXVpcmVzIHRoZSBzaWRlY2FyIGNvbnRhaW5lciBpbWFnZSBvbmx5IHRvIGJlIHVwZGF0ZWQgYW5kIG5vdCB0aGUgU2VydmxldCBlbmdpbmUgYXMgaWYgYm90aCB3b3VsZCBydW4gYXQgdGhlIHNhbWUgaW1hZ2UuIAoKCiMjIFByZXJlcXVpc2l0ZXMKCi0gS3ViZXJuZXRlcyAxLjEwKyAKCiMjIFByb3ZpZGVyLXNwZWNpZmljIFByZXJlcXVpc2l0ZXMKCgojIyBJbnN0YWxsaW5nIHRoZSBDaGFydAoKVG8gaW5zdGFsbCB0aGUgY2hhcnQgd2l0aCB0aGUgcmVsZWFzZSBuYW1lIGBteS1yZWxlYXNlYDoKCmBgYGJhc2gKJCBoZWxtIGluc3RhbGwgLS1uYW1lIG15LXJlbGVhc2Ugc3RhYmxlL3RvbWNhdApgYGAKClRoaXMgY29tbWFuZCBkZXBsb3lzIGEgdG9tY2F0IGRlZGljYXRlZCBzZXJ2ZXIgd2l0aCBzYW5lIGRlZmF1bHRzLgoKPiAqKlRpcCoqOiBMaXN0IGFsbCByZWxlYXNlcyB1c2luZyBgaGVsbSBsaXN0YAoKIyMgVW5pbnN0YWxsaW5nIHRoZSBDaGFydAoKVG8gdW5pbnN0YWxsL2RlbGV0ZSB0aGUgYG15LXJlbGVhc2VgIGRlcGxveW1lbnQ6CgpgYGBiYXNoCiQgaGVsbSBkZWxldGUgbXktcmVsZWFzZQpgYGAKClRoZSBjb21tYW5kIHJlbW92ZXMgYWxsIHRoZSBLdWJlcm5ldGVzIGNvbXBvbmVudHMgYXNzb2NpYXRlZCB3aXRoIHRoZSBjaGFydCBhbmQgZGVsZXRlcyB0aGUgcmVsZWFzZS4KCiMjIENvbmZpZ3VyYXRpb24KClRoZSBmb2xsb3dpbmcgdGFibGUgbGlzdHMgdGhlIGNvbmZpZ3VyYWJsZSBwYXJhbWV0ZXJzIG9mIHRoZSB0b21jYXQgY2hhcnQgYW5kIHRoZWlyIGRlZmF1bHQgdmFsdWVzLgoKUGFyYW1ldGVyICAgICAgICAgICAgICAgICAgICAgICB8IERlc2NyaXB0aW9uICAgICAgICAgICAgICAgICAgICAgICAgICAgfCBEZWZhdWx0Ci0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0gfCAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tIHwgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQpgaW1hZ2Uud2ViYXJjaGl2ZS5yZXBvc2l0b3J5YCAgIHwgU2lkZWNhciBpbWFnZSBzb3VyY2UgcmVwb3NpdG9yeSBuYW1lICB8IGBhbmFud2FyZXN5c3RlbXMvd2ViYXJjaGl2ZWAKYGltYWdlLndlYmFyY2hpdmUudGFnYCAgICAgICAgICB8IGB3ZWJhcmNoaXZlYCByZWxlYXNlIHRhZy4gICAgICAgICAgICAgfCBgMS4wYApgaW1hZ2UudG9tY2F0LnJlcG9zaXRvcnlgICAgICAgIHwgVG9tYWN0IGltYWdlIHNvdXJjZSByZXBvc2l0b3J5IG5hbWUgICB8IGB0b21jYXRgCmBpbWFnZS50b21jYXQudGFnYCAgICAgICAgICAgICAgfCBgdG9tY2F0YCByZWxlYXNlIHRhZy4gICAgICAgICAgICAgICAgIHwgYDcuMGAKYGltYWdlLnB1bGxQb2xpY3lgICAgICAgICAgICAgICB8IEltYWdlIHB1bGwgcG9saWN5ICAgICAgICAgICAgICAgICAgICAgfCBgSWZOb3RQcmVzZW50YApgaW1hZ2UucHVsbFNlY3JldHNgICAgICAgICAgICAgIHwgSW1hZ2UgcHVsbCBzZWNyZXRzICAgICAgICAgICAgICAgICAgICB8IGBbXWAKYGRlcGxveS5kaXJlY3RvcnlgICAgICAgICAgICAgICB8IFdlYmFyY2hpdmUgZGVwbG95bWVudCBkaXJlY3RvcnkgICAgICAgfCBgL3Vzci9sb2NhbC90b21jYXQvd2ViYXBwc2AKYGVudmAgICAgICAgICAgICAgICAgICAgICAgICAgICB8IEVudmlyb25tZW50IHZhcmlhYmxlcyAgICAgICAgICAgICAgICAgfCBgW11gCmBleHRyYVZvbHVtZXNgICAgICAgICAgICAgICAgICAgfCBFeHRyYSB2b2x1bWVzICAgICAgICAgICAgICAgICAgICAgICAgIHwgYFtdYApgZXh0cmFWb2x1bWVNb3VudHNgICAgICAgICAgICAgIHwgRXh0cmEgdm9sdW1lIG1vdW50cyAgICAgICAgICAgICAgICAgICB8IGBbXWAKYGV4dHJhSW5pdENvbnRhaW5lcnNgICAgICAgICAgICB8IEV4dHJhIGluaXQgY29udGFpbmVycyAgICAgICAgICAgICAgICAgfCBgW11gCmBob3N0UG9ydGAgICAgICAgICAgICAgICAgICAgICAgfCBob3N0UG9ydCAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgYDgwMDlgCmBzZXJ2aWNlLm5hbWVgICAgICAgICAgICAgICAgICAgfCBUb21jYXQgc2VydmljZSBuYW1lICAgICAgICAgICAgICAgICAgIHwgYGh0dHBgCmBzZXJ2aWNlLmV4dGVybmFsUG9ydGAgICAgICAgICAgfCBLdWJlcm5ldGVzIHNlcnZpY2UgcG9ydCAgICAgICAgICAgICAgIHwgYDgwYApgc2VydmljZS5pbnRlcm5hbFBvcnRgICAgICAgICAgIHwgVG9tY2F0IGZyb250IHBvcnQgICAgICAgICAgICAgICAgICAgICB8IGA4MDgwYApgc2VydmljZS50eXBlYCAgICAgICAgICAgICAgICAgIHwgS3ViZXJuZXRlcyBzZXJ2aWNlIHR5cGUgICAgICAgICAgICAgICB8IGBMb2FkQmFsYW5jZXJgCmByZWFkaW5lc3NQcm9iZS5wYXRoYCAgICAgICAgICAgfCBIVFRQIHBhdGggdG8gY2hlY2sgZm9yIHJlYWRpbmVzcyAgICAgIHwgYC9zYW1wbGVgCmBsaXZlbmVzc1Byb2JlLnBhdGhgICAgICAgICAgICAgfCBIVFRQIHBhdGggdG8gY2hlY2sgZm9yIHJlYWRpbmVzcyAgICAgIHwgYC9zYW1wbGVgCmByZXNvdXJjZXNgICAgICAgICAgICAgICAgICAgICAgfCBDUFUvTWVtb3J5IHJlc291cmNlIHJlcXVlc3RzL2xpbWl0cyAgIHwgYHt9YApgbm9kZVNlbGVjdG9yYCAgICAgICAgICAgICAgICAgIHwgTm9kZSBhZmZpbml0eSAgICAgICAgICAgICAgICAgICAgICAgICB8IGB7fWAKYHRvbGVyYXRpb25zYCAgICAgICAgICAgICAgICAgICB8IE5vZGUgdG9sZXJhdGlvbnMgICAgICAgICAgICAgICAgICAgICAgfCBge31gCgpSZWZlciB0byBbdmFsdWVzLnlhbWxdKHZhbHVlcy55YW1sKSBmb3IgdGhlIGZ1bGwgcnVuLWRvd24gb24gZGVmYXVsdHMuIFRoZXNlIGFyZSBhIG1peHR1cmUgb2YgS3ViZXJuZXRlcyBhbmQgdG9tY2F0LXJlbGF0ZWQgZGlyZWN0aXZlcyB0aGF0IG1hcCB0byBlbnZpcm9ubWVudCB2YXJpYWJsZXMuIAoKU3BlY2lmeSBlYWNoIHBhcmFtZXRlciB1c2luZyB0aGUgYC0tc2V0IGtleT12YWx1ZVssa2V5PXZhbHVlXWAgYXJndW1lbnQgdG8gYGhlbG0gaW5zdGFsbGAuIEZvciBleGFtcGxlLAoKYGBgYmFzaAokIGhlbG0gaW5zdGFsbCAtLW5hbWUgbXktcmVsZWFzZSBcCiAgLS1zZXQgVmFsdWVzLnNvbWV2YWw9TXkgU2VydmVyLEltYWdlVGFnPTEuMCBcCiAgICBzdGFibGUvdG9tY2F0CmBgYAoKVGhlIGFib3ZlIGNvbW1hbmQgZGVwbG95cyBUb21jYXQgZGVkaWNhdGVkIHdpdGggYSBzZXJ2ZXIgbmFtZSBvZiBgTXkgU2VydmVyYCBhbmQgZG9ja2VyLXRvbWNhdCBpbWFnZSB2ZXJzaW9uIGAxLjBgLgoKQWx0ZXJuYXRpdmVseSwgYSBZQU1MIGZpbGUgdGhhdCBzcGVjaWZpZXMgdGhlIHZhbHVlcyBmb3IgdGhlIHBhcmFtZXRlcnMgY2FuIGJlIHByb3ZpZGVkIHdoaWxlIGluc3RhbGxpbmcgdGhlIGNoYXJ0LiBGb3IgZXhhbXBsZSwKCmBgYGJhc2gKJCBoZWxtIGluc3RhbGwgLS1uYW1lIG15LXJlbGVhc2UgLWYgdmFsdWVzLnlhbWwgc3RhYmxlL3N0YWJsZQpgYGAKCj4gKipUaXAqKjogWW91IGNhbiB1c2UgdGhlIGRlZmF1bHQgW3ZhbHVlcy55YW1sXSh2YWx1ZXMueWFtbCkKCiMjIFBlcnNpc3RlbmNlCgo+ICoiQW4gZW1wdHlEaXIgdm9sdW1lIGlzIGZpcnN0IGNyZWF0ZWQgd2hlbiBhIFBvZCBpcyBhc3NpZ25lZCB0byBhIE5vZGUsIGFuZCBleGlzdHMgYXMgbG9uZyBhcyB0aGF0IFBvZCBpcyBydW5uaW5nIG9uIHRoYXQgbm9kZS4gV2hlbiBhIFBvZCBpcyByZW1vdmVkIGZyb20gYSBub2RlIGZvciBhbnkgcmVhc29uLCB0aGUgZGF0YSBpbiB0aGUgZW1wdHlEaXIgaXMgZGVsZXRlZCBmb3JldmVyLiIqCgojIyBDcmVkaXRzCgpbSmF2YSBXZWIgQXBwbGljYXRpb24gd2l0aCBUb21jYXQgYW5kIFNpZGVjYXIgQ29udGFpbmVyXShodHRwczovL2dpdGh1Yi5jb20va3ViZXJuZXRlcy9leGFtcGxlcy90cmVlL21hc3Rlci9zdGFnaW5nL2phdmF3ZWItdG9tY2F0LXNpZGVjYXIpCg=="
+                    }
+                ]
+            },
+            "manifest": "---\n# Source: tomcat/templates/appsrv-svc.yaml\napiVersion: v1\nkind: Service\nmetadata:\n  name: tomcat\n  labels:\n    app: tomcat\n    chart: tomcat-0.4.3\n    release: tomcat\n    heritage: Helm\nspec:\n  type: LoadBalancer\n  ports:\n    - port: 80\n      targetPort: 8080\n      protocol: TCP\n      name: http\n  selector:\n    app: tomcat\n    release: tomcat\n---\n# Source: tomcat/templates/appsrv.yaml\napiVersion: apps/v1\nkind: Deployment\nmetadata:\n  name: tomcat\n  labels:\n    app: tomcat\n    chart: tomcat-0.4.3\n    release: tomcat\n    heritage: Helm\nspec:\n  replicas: 1\n  selector:\n    matchLabels:\n      app: tomcat\n      release: tomcat\n  template:\n    metadata:\n      labels:\n        app: tomcat\n        release: tomcat\n    spec:\n      volumes:\n        - name: app-volume\n          emptyDir: {}\n      initContainers:\n        - name: war\n          image: ananwaresystems/webarchive:1.0\n          imagePullPolicy: IfNotPresent\n          command:\n            - \"sh\"\n            - \"-c\"\n            - \"cp /*.war /app\"\n          volumeMounts:\n            - name: app-volume\n              mountPath: /app\n\n      containers:\n        - name: tomcat\n          image: tomcat:7.0\n          imagePullPolicy: IfNotPresent\n          volumeMounts:\n            - name: app-volume\n              mountPath: /usr/local/tomcat/webapps\n          ports:\n            - containerPort: 8080\n              hostPort: 8009\n          livenessProbe:\n            httpGet:\n              path: /sample\n              port: 8080\n            initialDelaySeconds: 60\n            periodSeconds: 30\n            failureThreshold: 6\n            timeoutSeconds: 5\n          readinessProbe:\n            httpGet:\n              path: /sample\n              port: 8080\n            initialDelaySeconds: 60\n            periodSeconds: 30\n            failureThreshold: 6\n            timeoutSeconds: 5\n          resources:\n            {}\n",
+            "version": 22,
+            "namespace": "default"
+        })
+        const test = await r.getCommitMessage()
+        expect(test).to.be.deep.equal('test');
+    });
+
     it('should init revision', () => {
         const RevisionProxy = getProxyRevision();
         const r = new RevisionProxy(getFakeDataToInitiateRevision());

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.23.8",
+  "version": "1.23.9",
   "name": "@codefresh-io/kube-integration",
   "main": "index.js",
   "description": "",
@@ -33,7 +33,7 @@
   },
   "dependencies": {
     "@codefresh-io/docker-reference": "^0.0.5",
-    "@codefresh-io/eventbus": "^1.3.3",
+    "@codefresh-io/eventbus": "1.4.1",
     "@codefresh-io/http-infra": "^1.8.9",
     "bluebird": "^3.5.0",
     "body-parser": "^1.17.2",

package/service.yaml

@@ -1 +1 @@
-version: 1.23.8
+version: 1.25.3