@codefresh-io/kube-integration 1.24.9-node16 → 1.25.0

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

@@ -20,14 +20,8 @@ spec:
       app: {{ template "kube-integration.fullname" . }}
   template:
     metadata:
-      {{- if .Values.redeploy }}
       annotations:
-        forceRedeployUniqId: {{ now | quote }}
-        sidecar.istio.io/inject: {{ $.Values.global.istio.enabled | default "false" | quote }}
-      {{- else }}
-      annotations:
-        sidecar.istio.io/inject: {{ $.Values.global.istio.enabled | default "false" | quote }}
-      {{- end }}
+        checksum/secret: {{ include (print $.Template.BasePath "/secrets.yaml") . | sha256sum }}
       labels:
         app: {{ template "kube-integration.fullname" . }}
         chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"

package/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:12.22.12-alpine
+FROM node:14.20.0-alpine
 
 WORKDIR /kube-integration
 

package/config/index.js

@@ -72,14 +72,6 @@ base.newrelic = {
     license_key: process.env.NEWRELIC_LICENSE_KEY
 };
 
-base.mongo = {
-    uri: process.env.MONGO_URI || 'mongodb://codefresh.dev:27017/kube',
-    options: {
-        reconnectTries: process.env.MONGO_RECONNECT_TRIES || Number.MAX_VALUE,
-        reconnectInterval: process.env.MONGO_RECONNECT_INTERVAL || 30 * 1000
-    }
-};
-
 base.eventbus = {
     uri: process.env.EVENTBUS_URI || 'amqp://codefresh.dev',
     reconnectInterval: process.env.EVENTBUS_INTERVAL || 5,
@@ -98,12 +90,6 @@ base.helm = {
     maxHelmHistorySize: process.env.MAX_HELM_HISTORY_SIZE, // If set, limits history in release
 };
 
-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/infra/index.js

@@ -7,7 +7,6 @@ monitor.init();
 const Promise       = require('bluebird'); // jshint ignore:line
 const processEvents = require('./process-events');
 const express       = require('./express');
-const mongo         = require('./mongo');
 const eventbus      = require('./eventbus');
 const logger        = require('cf-logs').Logger('codefresh:infra:index');
 
@@ -25,7 +24,6 @@ class Microservice {
             })
             .then(() => {
                 return Promise.all([
-                    // mongo.init(config),
                     eventbus.init(config)
                 ]);
             })
@@ -50,7 +48,6 @@ class Microservice {
         logger.info('Starting shutdown...');
         return Promise.all([
             express.stop(),
-            // mongo.stop(),
             eventbus.stop()
         ])
             .then(() => {
@@ -60,4 +57,4 @@ class Microservice {
 
 }
 
-module.exports = new Microservice();
+module.exports = new Microservice();

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.24.9-node16",
+  "version": "1.25.0",
   "name": "@codefresh-io/kube-integration",
   "main": "index.js",
   "description": "",
@@ -19,7 +19,7 @@
     "url": "git+https://github.com/codefresh-io/kube-integration.git"
   },
   "engines": {
-    "node": "16.16.0"
+    "node": "14.20.0"
   },
   "author": "Oleg Sucharevich <olegs@codefresh.io>",
   "license": "ISC",
@@ -33,7 +33,8 @@
     "normalize-url": "4.5.1",
     "shelljs": "0.8.5",
     "node-forge": "1.3.0",
-    "openid-client": "^4.9.0"
+    "openid-client": "^4.9.0",
+    "newrelic": "7.0.1"
   },
   "dependencies": {
     "@codefresh-io/docker-reference": "^0.0.5",
@@ -43,7 +44,7 @@
     "body-parser": "^1.17.2",
     "cf-errors": "^0.1.16",
     "cf-logs": "^1.1.24",
-    "cf-monitor": "git+https://github.com/codefresh-io/cf-monitor.git#v0.0.22",
+    "cf-monitor": "git+https://github.com/codefresh-io/cf-monitor.git#00af78d3d7c7bffc41f27f75279a66a30f0ab987",
     "compression": "^1.6.2",
     "cookie-parser": "^1.4.3",
     "eventemitter2": "^4.1.2",
@@ -54,7 +55,6 @@
     "kubernetes-client": "^8.3.7",
     "lodash": "~4.17.21",
     "method-override": "^2.3.9",
-    "mongoose": "^5.12.3",
     "morgan": "^1.10.0",
     "nock": "^12.0.3",
     "nodegistry": "^1.2.3",

package/service.yaml

@@ -1 +1 @@
-version: 1.25.20
+version: 1.25.22

package/infra/mongo.js

@@ -1,40 +0,0 @@
-'use strict';
-
-const Promise    = require('bluebird');
-const logger     = require('cf-logs').Logger('codefresh:infra:mongo');
-const mongoose   = require('mongoose');
-mongoose.Promise = require('bluebird');
-
-
-class Mongo {
-
-    constructor() {
-
-    }
-
-    /**
-     * starts the connection to mongo
-     * @returns {*}
-     */
-    init(config) {
-        console.log(`Conncting to mongo uri: ${config.mongo.uri}`);
-        return mongoose.connect(config.mongo.uri, {
-            ...config.mongo.options,
-            autoReconnect: true
-        }).then(() => {
-            console.log(`Mongoose connected to: ${config.mongo.uri}`);
-        });
-    }
-
-
-    /**
-     * stops the connection to mongo
-     * @returns {*}
-     */
-    stop() {
-        return Promise.resolve();
-    }
-}
-
-
-module.exports = new Mongo();