@codefresh-io/kube-integration 2.0.0 → 2.1.0

package/.deploy/kube-integration/templates/serviceMonitor.yaml

@@ -0,0 +1,2 @@
+{{- $templateName := printf "cf-common-%s.serviceMonitor" (index .Subcharts "cf-common").Chart.Version -}}
+{{- include $templateName . -}}

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

@@ -160,6 +160,38 @@ container:
     URI_QUERY_MAX_ITEMS: "{{ .Values.global.uriQueryMaxItems }}"
     URI_QUERY_ARRAY_MAX_ITEMS: "{{ .Values.global.uriQueryArrayMaxItems }}"
 
+    ## Service metadata
+    CF_SERVICE_NAME:
+      valueFrom:
+        fieldRef:
+          fieldPath: metadata.labels['app.kubernetes.io/name']
+    CF_SERVICE_VERSION: "{{ .Chart.Version }}"
+
+    ## cf-telemetry config
+    A_POD_NAME:
+      valueFrom:
+        fieldRef:
+          fieldPath: metadata.name
+    A_NAMESPACE_NAME:
+      valueFrom:
+        fieldRef:
+          fieldPath: metadata.namespace
+    # Pyroscope
+    CF_TELEMETRY_PYROSCOPE_ENABLE: "false"
+    CF_TELEMETRY_PYROSCOPE_TAGS: "pod=$(A_POD_NAME),namespace=$(A_NAMESPACE_NAME)"
+    # Prometheus
+    CF_TELEMETRY_PROMETHEUS_ENABLE: "false"
+    CF_TELEMETRY_PROMETHEUS_ENABLE_PROCESS_METRICS: "true"
+    CF_TELEMETRY_PROMETHEUS_HOST: "0.0.0.0"
+    CF_TELEMETRY_PROMETHEUS_PORT: "9100"
+    CF_TELEMETRY_PROMETHEUS_CONTENT_TYPE: "openmetrics"
+    # Logs
+    CF_TELEMETRY_LOGS_LEVEL: "info"
+    CF_TELEMETRY_LOGS_SYNC: "false"
+    CF_TELEMETRY_LOGS_PRETTIFY: "false"
+    # OpenTelemetry
+    CF_TELEMETRY_OTEL_ENABLE: "false"
+    
   extraEnv:
     EVENTBUS_URI: $(RABBITMQ_PROTOCOL)://$(RABBITMQ_USERNAME):$(RABBITMQ_PASSWORD)@$(RABBITMQ_HOSTNAME)
 
@@ -221,3 +253,18 @@ service:
       http:
         port: 9000
         protocol: HTTP
+      prom-metrics:
+        protocol: TCP
+        port: 9100
+      otel-metrics:
+        protocol: TCP
+        port: 9464
+
+serviceMonitor:
+  main:
+    enabled: false
+    endpoints:
+    - path: /metrics
+      port: otel-metrics
+    - path: /metrics
+      port: prom-metrics

package/.github/workflows/validate-pr-title.yaml

@@ -16,7 +16,7 @@ jobs:
       pull-requests: read
       statuses: write
     steps:
-    - uses: amannn/action-semantic-pull-request@v5.4.0
+    - uses: amannn/action-semantic-pull-request@v6.1.1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:

package/CODEOWNERS

@@ -3,7 +3,7 @@
 *                   @codefresh-io/Codefresh_Developers
 
 # team leads are responsible for the codeowners file and the migration scripts
-CODEOWNERS          @codefresh-io/teamleads
+CODEOWNERS          @codefresh-io/DevOps @codefresh-io/teamleads zhenya.tikhonov@octopus.com
 
 # helm charts for DevOps team
-.deploy/            @codefresh-io/Codefresh_Developers @codefresh-io/DevOps
+.deploy/            @codefresh-io/DevOps @codefresh-io/Codefresh_Developers

package/Dockerfile

@@ -16,7 +16,7 @@ RUN yarn install --production --frozen-lockfile
 RUN mkdir /logs
 
 
-FROM octopusdeploy/dhi-node:${DHI_NODE_TAG}_${DHI_NODE_CUSTOMIZATION}@sha256:3a831f3711c6349932c94c9475157444aa1c1452879f34a5d79bcc79e1985b9e AS prod
+FROM octopusdeploy/dhi-node:${DHI_NODE_TAG}_${DHI_NODE_CUSTOMIZATION}@sha256:ad632c0e0c95fe06c45a0deff94899290e0359b547b735469d86203faa1b3d15 AS prod
 WORKDIR /kube-integration
 COPY --chown=node:node --chmod=755 --from=prod-deps /kube-integration/ /kube-integration/
 COPY --chown=node:node --chmod=755 --from=prod-deps /logs/ /logs/

package/config/index.js

@@ -13,61 +13,6 @@ base.env = process.env.NODE_ENV || 'kubernetes';
 base.port = process.env.PORT || 9003;
 base.name = name;
 
-base.logger = {
-    filePath: process.env.LOGS_PATH || path.join(__dirname, '../../logs', 'kubernetes-logs.log'),
-    console: true,
-    handleExceptions: false,
-    showNamespace: true,
-    env_module: `${name}_${os.hostname()}`,
-    showRequestId: true,
-    level: "debug",
-    consoleOptions: {
-        timestamp: function () {
-            return new Date().toISOString();
-        },
-        formatter: function (options) {
-            // Return string will be passed to logger.
-            const shouldFormatOutput = !!process.env['FORMAT_LOGS_TO_ELK'];
-            if (shouldFormatOutput) {
-                return JSON.stringify({
-                    metadata: options.meta || {},
-                    data: Object.assign(options.data || {}, { message: options.message }),
-                });
-            }
-            // human readable format
-            return `${options.timestamp()} ${options.level.toUpperCase()} >> ` +
-                `${options.message || ''}` +
-                `${options.meta && Object.keys(options.meta).length ? ` << ${JSON.stringify(options.meta)}` : ''}`;
-        }
-    },
-    basePath: null,
-    baseNamespace: "codefresh",
-    fields: {
-        service: process.env['SERVICE_NAME'] || 'service-base',
-        time: () => { return new Date().toISOString(); },
-        correlationId: () => {
-            try {
-                return getRequestId();
-            } catch (err) {
-                return {};
-            }
-        },
-        user: () => {
-            try {
-                const { _user: { name, _id } } = getAuthenticatedEntity();
-                return { name, _id };
-            } catch (err) {
-                return {};
-            }
-        }
-    }
-};
-
-base.httpLogger = {
-    level: process.env.HTTP_LOGGER_LEVEL || 'debug',
-    format: 'dev'
-};
-
 base.eventbus = {
     uri: process.env.EVENTBUS_URI || 'amqp://codefresh.dev',
     reconnectInterval: process.env.EVENTBUS_INTERVAL || 5,

package/index.js

@@ -1,4 +1,8 @@
 'use strict';
+/* eslint-disable global-require */
+// ↓ Should be imported first
+require('@codefresh-io/cf-telemetry/init');
+// ↓ Keep one blank line below to prevent automatic import reordering
 
 module.exports = start();
 

package/infra/eventbus.js

@@ -2,9 +2,10 @@
 
 const Promise   = require('bluebird');
 const eventBus  = require('@codefresh-io/eventbus');
-const logger    = require('cf-logs').Logger("codefresh:infra:eventbus");
+const { Logger } = require('@codefresh-io/cf-telemetry/logs');
 const config    = require('./../config');
 
+const logger    = new Logger("codefresh:infra:eventbus");
 
 class Eventbus {
 
@@ -44,15 +45,14 @@ class Eventbus {
                 });
 
                 eventBus.on('ready', () => {
-                    console.log('Eventbus ready');
+                    logger.info('Eventbus ready');
                     this.eventbusInitialized = true;
                     deferred.resolve();
                 });
 
                 eventBus.on('error', (err) => {
-                    const error = new Error(`Eventbus error: ${err.stack}`);
-                    logger.error(error.stack);
                     // monitor.noticeError(error); // Used earlier to report an error to New Relic
+                    logger.error(`Eventbus error`, err);
                 });
 
                 return deferred.promise;
@@ -91,8 +91,8 @@ class Eventbus {
         logger.debug(`Publishing event: ${name}`);
         eventBus.publish(name, data)
             .catch((err) => {
-                logger.error(err.stack);
                 // monitor.noticeError(err); // Used earlier to report an error to New Relic
+                logger.error(`Failed to publish event: ${name}`, err);
             })
             .done();
     }

package/infra/express.js

@@ -5,8 +5,8 @@ const express = require('express');
 const compression = require('compression');
 const methodOverride = require('method-override');
 const cookieParser = require('cookie-parser');
-const morgan = require('morgan');
-const logger = require('cf-logs').Logger("codefresh:infra:express");
+const { Logger } = require('@codefresh-io/cf-telemetry/logs');
+const { httpLoggerMiddlewareFactory } = require(`@codefresh-io/cf-telemetry/logs/express`);
 const api = require('../server/api');
 const _ = require('lodash');
 const middlewares = require('./middleware');
@@ -14,6 +14,7 @@ const httpInfra = require('@codefresh-io/http-infra');
 const CFError = require('cf-errors');
 const qs = require('qs')
 
+const logger = new Logger("codefresh:infra:express");
 
 class Express {
 
@@ -65,6 +66,7 @@ class Express {
                         parameterLimit: this.config.queryString.uriQueryMaxItems,
                         arrayLimit: this.config.queryString.uriQueryArrayMaxItems
                     })});
+                app.use(httpLoggerMiddlewareFactory(new Logger('http')));    
                 app.use(httpInfra.newDomainMiddleware());
                 app.use(cookieParser());
                 app.use(compression());
@@ -72,23 +74,6 @@ class Express {
                 app.use(express.json());
                 app.use(methodOverride());
 
-                if (this.config.httpLogger) {
-                    app.use(morgan(this.config.httpLogger.format, {
-                        skip: (req, res) => {
-                            if (this.config.httpLogger.level === 'debug') {
-                                return false;
-                            }
-                            var code = res.statusCode;
-                            return code < 400;
-                        },
-                        stream: {
-                            write: (str) => {
-                                logger.info(str.substring(0, str.length - 1));
-                            }
-                        }
-                    }));
-                }
-
                 app.get('/api/ping', (req, res) => {
                     res.status(200).send();
                 });
@@ -143,9 +128,9 @@ class Express {
                     if (err instanceof CFError) {
                         if (!err.getFirstValue("recognized")) {
                             // monitor.noticeError(err); // Used earlier to report an error to New Relic
+                            logger.error(err);
                         }
                     }
-                    logger.error(err.stack);
                     if (res.headersSent) {
                         return next(err);
                     }
@@ -168,10 +153,10 @@ class Express {
 
             const server = app.listen(this.config.port, (err) => {
                 if (err) {
-                    console.log(`Failed to load service with message ${err.message}`);
+                    logger.error(`Failed to load service`, err);
                     reject(err);
                 } else {
-                    console.log(`Express server listening on port ${this.config.port}, in mode ${this.config.env}`);
+                    logger.info(`Express server listening on port ${this.config.port}, in mode ${this.config.env}`);
                     resolve(server);
                 }
             });

package/infra/index.js

@@ -1,38 +1,39 @@
 "use strict";
 
-const logging       = require('./logging');
+const { terminate } = require('@codefresh-io/cf-telemetry/init');
+const { Logger } = require('@codefresh-io/cf-telemetry/logs');
 const config  = require('../config');
 const Promise       = require('bluebird'); // jshint ignore:line
 const processEvents = require('./process-events');
 const express       = require('./express');
 const eventbus      = require('./eventbus');
-const logger        = require('cf-logs').Logger('codefresh:infra:index');
+const logger = new Logger('codefresh:infra:index');
 
 class Microservice {
 
     constructor() {}
 
     init() {
-        return logging.init(config)
+        
+        return processEvents.init(config)
             .then(() => {
-                return processEvents.init(config)
-                    .then(() => {
-                        processEvents.on('SIGTERM', this.stop.bind(this));
-                    });
+                processEvents.on('SIGTERM', this.stop.bind(this, 'SIGTERM'));
             })
             .then(() => {
-                return Promise.all([
-                    eventbus.init(config)
-                ]);
+                processEvents.on('SIGINT', this.stop.bind(this, 'SIGINT'));
+            })
+            .then(() => {
+                return eventbus.init(config)
             })
             .then(() => {
                 return express.init(config);
             })
             .then(() => {
-                console.log(`Initialization completed`);
+                logger.info(`Initialization completed`);
             })
-            .catch((err) => {
-                console.error(`Initialization error: ${err.stack}`);
+            .catch(async (err) => {
+                logger.error(`Initialization error`, err);
+                await terminate();
                 process.exit(1);
             })
             .done();
@@ -42,13 +43,13 @@ class Microservice {
     // - first phase need to make sure to not accept any new requests/events
     // - then a decent amount of time will be given to clear all on-going contexts
     // - second phase will close all dependencies connections like mongo, postgres etc
-    stop() {
-        logger.info('Starting shutdown...');
+    stop(signal) {
+        logger.info(`Starting shutdown due to ${signal}...`);
         return Promise.all([
-            express.stop(),
-            eventbus.stop()
-        ])
-            .then(() => {
+                express.stop(),
+                eventbus.stop()
+            ]).then(async () => {
+                await terminate(signal);   
                 logger.info('Shutdown completed, exiting');
             });
     }

package/infra/kube.manager.event.handler.js

@@ -2,6 +2,9 @@
 
 const _            = require('lodash');
 const publishEvent = require('./../infra/eventbus').publishEvent;
+const { Logger } = require('@codefresh-io/cf-telemetry/logs');
+
+const logger    = new Logger("codefresh:infra:event-handler");
 
 function handler(account, user) {
     return function (event, data) {
@@ -15,7 +18,7 @@ function handler(account, user) {
                 userName: user.userName
             }), ['accountId', 'userId'])
         };
-        console.log(`Publishing ${event}, ${JSON.stringify(data)}`);
+        logger.debug(`Publishing event: ${event}`,data);
         publishEvent(event, dataToBeSent);
     }
 }

package/infra/middleware.js

@@ -2,12 +2,13 @@
 
 const _                = require('lodash');
 const Promise          = require('bluebird');
-const logger           = require('cf-logs').Logger("codefresh:infra:middlewares");
+const { Logger }       = require('@codefresh-io/cf-telemetry/logs');
 const KubeManager      = require('./../lib/kube.manager');
 const config           = require('./../config');
 const MatchFilter      = require('./../server/helpers/filters').Match;
 const kubeEventHandler = require('./kube.manager.event.handler');
 
+const logger = new Logger("codefresh:infra:middlewares");
 
 function ensureNamespaceId(req, res, next) {
     const result = req.checkQuery('namespaceId', 'Query must have namespaceId').notEmpty();

package/infra/process-events.js

@@ -2,7 +2,9 @@
 
 const EventEmitter = require('events');
 const Promise      = require('bluebird');
-const logger       = require('cf-logs').Logger('codefresh:infra:process-events');
+const { Logger } = require('@codefresh-io/cf-telemetry/logs');
+
+const logger = new Logger('codefresh:infra:process-events');
 
 class ProcessEvents extends EventEmitter {
 
@@ -25,12 +27,9 @@ class ProcessEvents extends EventEmitter {
                     this.emit('SIGTERM');
                 });
 
-                process.on('unhandledRejection', (err) => {
-                    logger.error(`Unhandled rejection ${err.stack}`);
-                });
-
-                process.on('uncaughtException', (err) => {
-                    logger.error(`Uncaught Exception: ${err.stack}`);
+                process.on('SIGINT', () => {
+                    logger.info('SIGINT received');
+                    this.emit('SIGINT');
                 });
 
             });

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

@@ -1,5 +1,8 @@
 const Promise = require('bluebird');
 const _ = require('lodash');
+const { Logger } = require('@codefresh-io/cf-telemetry/logs');
+
+const logger    = new Logger("codefresh:helm:release");
 
 class BasePool {
     constructor({ Revision, Release }, { sources }) {
@@ -87,7 +90,7 @@ class BasePool {
                     }
                 })
                 .catch(err => {
-                    console.log(err);
+                    logger.error(`Failed to prepare release`, err);
                 });
         });
     }

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

@@ -23,6 +23,9 @@ class FakeConfigMap {
     getProperty() {
         return {};
     }
+    getNamespace() {
+        return 'default';
+    }
 };
 
 function getFakeController() {

package/lib/kube-native/namespace/namespace.builder.js

@@ -1,6 +1,5 @@
 'use strict';
 
-const _           = require('lodash');
 const BaseBuilder = require('./../../kube-native/builder.base');
 
 class NamespaceBuilder extends BaseBuilder{

package/lib/kube-native/namespace/namespace.js

@@ -1,12 +1,11 @@
 'use strict';
 
-const _          = require('lodash');
 const BaseEntity = require('./../../kube-native/entity.base');
 
 class Namespace extends BaseEntity {
 
     getName() {
-        return _.get(this._getData(), 'metadata.name');
+        return this._getData()?.metadata?.name;
     }
 
     getBasicData() {

package/lib/kube-native/node/node.js

@@ -1,37 +1,36 @@
 'use strict';
 
 const BaseEntity = require('./../entity.base');
-const _          = require('lodash');
 
 class Node extends BaseEntity {
 
     getName() {
-        return _.get(this._getData(), 'metadata.name');
+        return this._getData()?.metadata?.name;
     }
 
     getStatus() {
-        let conditions = _.get(this._getData(), 'status.conditions') || [];
+        let conditions = this._getData()?.status?.conditions || [];
         return conditions.filter((condition) => condition.type === 'Ready').pop();
     }
 
     getInternalIP() {
-        let addresses = _.get(this._getData(), 'status.addresses') || [];
+        let addresses = this._getData()?.status?.addresses || [];
         let address = addresses.filter((address) => address.type === 'InternalIP').pop();
-        return _.get(address, 'address') || 'N/A';
+        return address?.address || 'N/A';
     }
 
     getExternalIP() {
-        let addresses = _.get(this._getData(), 'status.addresses') || [];
+        let addresses = this._getData()?.status?.addresses || [];
         let address = addresses.filter((address) => address.type === 'ExternalIP').pop();
-        return _.get(address, 'address') || 'N/A';
+        return address?.address || 'N/A';
     }
 
     getCreatedAt() {
-        return _.get(this._getData(), 'metadata.creationTimestamp');
+        return this._getData()?.metadata?.creationTimestamp;
     }
 
     getLabels() {
-        return _.get(this._getData(), 'metadata.labels');
+        return this._getData()?.metadata?.labels;
     }
 
     getBasicData() {

package/lib/kube-native/pod/pod.controller.js

@@ -1,6 +1,5 @@
 'use strict';
 
-const _ = require('lodash');
 const Promise = require('bluebird');
 const ResourceController = require('./../resource.base.controller');
 const { SquashedPod, SquashedPodPool } = require('./../../internal-components/SquashedPod');

package/lib/kube-native/replicaSet/rs.js

@@ -1,20 +1,19 @@
 'use strict';
 
-const _          = require('lodash');
 const BaseEntity = require('./../entity.base');
 
 class ReplicaSet extends BaseEntity {
 
     getName() {
-        return _.get(this._getData(), 'metadata.name');
+        return this._getData()?.metadata?.name;
     }
 
     getReplicas(){
-        return _.get(this._getData(), 'status.replicas', 0);
+        return this._getData()?.status?.replicas || 0;
     }
 
     getNamespace() {
-        return _.get(this._getData(), 'metadata.namespace');
+        return this._getData()?.metadata?.namespace;
     }
 
     getBasicData() {

package/lib/kube-native/replicaSet/rs.status.analyzer.js

@@ -14,11 +14,11 @@ class ReplicaSetStatusAnalyzer extends Base {
     analyze() {
         this._finalStauts = Base.types.unknown;
 
-        const readyReplicas        = _.get(this, '_status.readyReplicas');
-        const fullyLabeledReplicas = _.get(this, '_status.fullyLabeledReplicas');
-        const observedGeneration   = _.get(this, '_status.observedGeneration');
-        const replicas             = _.get(this, '_status.replicas');
-        const availableReplicas    = _.get(this, '_status.availableReplicas');
+        const readyReplicas        = this._status.readyReplicas;
+        const fullyLabeledReplicas = this._status.fullyLabeledReplicas;
+        const observedGeneration   = this._status.observedGeneration;
+        const replicas             = this._status.replicas;
+        const availableReplicas    = this._status.availableReplicas;
 
 
         if (!_.isNumber(replicas)) {
@@ -37,7 +37,6 @@ class ReplicaSetStatusAnalyzer extends Base {
         });
     }
 
-
 }
 
 

package/lib/kube-native/secret/image.pull.secret.builder.js

@@ -1,7 +1,5 @@
 'use strict';
 
-const crypto      = require('crypto');
-const _           = require('lodash');
 const BaseBuilder = require('./../builder.base');
 
 class ImagePullSecretBuilder extends BaseBuilder {

package/lib/kube-native/secret/secret.controller.js

@@ -4,13 +4,16 @@ const _                      = require('lodash');
 const Promise                = require('bluebird');
 const YAML                   = require('js-yaml');
 const crypto                 = require('crypto');
-const logger                 = require('cf-logs').Logger('codefresh:lib:kube-native:secret:secret-controller');
+const { Logger } = require('@codefresh-io/cf-telemetry/logs');
+
 const ResourceController     = require('./../resource.base.controller');
 const Secret                 = require('./secret');
 const ImagePullSecretBuilder = require('./image.pull.secret.builder');
 const SecretEvents           = require('./secret.events');
 const secretLabels           = require('./secret.labels');
 
+const logger = new Logger('codefresh:lib:kube-native:secret:secret-controller');
+
 
 
 class KubeSecretController extends ResourceController {

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.0.0",
+  "version": "2.1.0",
   "name": "@codefresh-io/kube-integration",
   "main": "index.js",
   "description": "",
@@ -32,15 +32,16 @@
     "tough-cookie": "4.1.3",
     "@kubernetes/client-node": "0.22.1",
     "**/request/form-data": "^2.4.5",
-    "**/request/qs": "6.14.2"
+    "**/request/qs": "6.15.2",
+    "**/postman-request/qs": "6.15.2"
   },
   "dependencies": {
+    "@codefresh-io/cf-telemetry": "^4.2.1",
     "@codefresh-io/docker-reference": "^0.1.0",
     "@codefresh-io/eventbus": "^2.4.0",
     "@codefresh-io/http-infra": "^1.8.15",
     "bluebird": "^3.7.2",
     "cf-errors": "^0.1.17",
-    "cf-logs": "^1.1.28",
     "compression": "^1.8.1",
     "cookie-parser": "^1.4.7",
     "eventemitter2": "^4.1.2",
@@ -51,7 +52,6 @@
     "kubernetes-client": "^9.0.0",
     "lodash": "^4.18.1",
     "method-override": "^2.3.9",
-    "morgan": "^1.10.1",
     "nock": "^12.0.3",
     "nodegistry": "^1.3.1",
     "object-hash": "^1.2.0",

package/server/api/crud.base.controller.js

@@ -7,13 +7,13 @@ const ResponseHandler = require('./../helpers/ResponseHandler');
 class CrudController {
 
     constructor(data) {
-        this._shouldLookForNs = _.get(data, 'lookForNamespaces', false);
+        this._shouldLookForNs = data?.lookForNamespaces || false;
     }
 
     getAll(request, response, next) {
         const filters                = request.filters;
         const kubeResourceController = request.kubeResourceController;
-        const labelSelector = request.query.labelSelector;
+        const labelSelector = request.query?.labelSelector;
         const searchFilter = labelSelector ? { labelSelector } : {};
         if (this._shouldLookForNs) {
             const namespaces = request.namespaces;
@@ -39,7 +39,7 @@ class CrudController {
 
     describe(request, response, next) {
         const kubeResourceController = request.kubeResourceController;
-        let omitFields               = _.get(request, 'query.omit', ['']);
+        let omitFields               = request.query?.omit || [''];
         if (_.isString(omitFields) && _.includes(omitFields, ',')) {
             omitFields = omitFields.split(',');
         }

package/server/api/index.js

@@ -7,8 +7,6 @@ const path = require('path');
 const CONTROLLERS_PATH = './internal';
 const apis = fs.readdirSync(path.join(__dirname, CONTROLLERS_PATH));
 
-const _    = require('lodash');
-
 
 function createRoutes(app) {
     apis.forEach(api => {

package/server/api/internal/test/index.js

@@ -2,7 +2,6 @@
 
 const router            = require('express').Router();
 const ResponseHandler   = require('./../../../helpers/ResponseHandler');
-const KubeManager       = require('./../../../../lib/kube.manager');
 
 
 function init() {

package/server/api/kube-native/releases/controller.js

@@ -1,9 +1,6 @@
 'use strict';
 
 const _                          = require('lodash');
-const Promise                    = require('bluebird');
-const logger                     = require('cf-logs');
-const ResponseHandler            = require('./../../../helpers/ResponseHandler');
 const BaseCrudController         = require('./../../crud.base.controller');
 
 

package/server/api/kube-native/secrets/controller.js

@@ -47,10 +47,10 @@ class Controller extends BaseCrudController {
     createImagePullSecret(request, response, next) {
         const account            = request.account;
         const user               = request.user;
-        const bodyRegistries     = _.get(request, 'body.accountRegistries');
-        const resitries          = _.get(account, 'integrations.registries', []);
+        const bodyRegistries     = request.body?.accountRegistries;
+        const resitries          = account?.integrations?.registries || [];
         const accountsRegistries = bodyRegistries ? bodyRegistries : resitries;
-        const registryName       = _.get(request, 'body.registry');
+        const registryName       = request.body?.registry;
         const namespaces         = request.namespaces;
         const kubeManager        = request.kubeManager;
         const secretController   = kubeManager.getSecretController.bind(kubeManager);

package/server/api/kube-native/services/controller.js

@@ -5,6 +5,8 @@ const Promise            = require('bluebird');
 const ResponseHandler    = require('./../../../helpers/ResponseHandler');
 const BaseCrudController = require('./../../crud.base.controller');
 const StatusAnalyzer     = require('./../../../../lib/status.analyzer.base');
+const { Logger } = require('@codefresh-io/cf-telemetry/logs');
+const logger    = new Logger("codefresh:api:kube-native:controller");
 
 function formatQueryAsString(queryAsStringOrArryay) {
     if (_.isArray(queryAsStringOrArryay)) {
@@ -240,7 +242,7 @@ class Controller extends BaseCrudController {
                 .catch((err) => {
                     // do not stop the execution if one resource delete request throws an error
                     // todo: think of how to return this information back to the client
-                    console.log(err.stack);
+                    logger.error(`Failed to delete resource: ${resource.getName()}`, err);
                     return;
                 });
         });

package/server/api/native.endpoints.js

@@ -63,11 +63,11 @@ function initExpressController(route, options) {
     let controller;
 
     // non standard controller
-    if (options.expressController) {
+    if (options?.expressController) {
         controller = require(`./kube-native/${options.expressController.path || route}/controller`);
     } else {
         controller = new BaseController({
-            lookForNamespaces: _.get(options, 'baseController.lookForNamespaces', false)
+            lookForNamespaces: options?.baseController?.lookForNamespaces || false
         });
     }
     if (!options.resolveNamespacesFromQuery) {
@@ -93,7 +93,7 @@ function initExpressController(route, options) {
     router.put('/:name', controller.update.bind(controller));
 
     //Non standard routes comes here
-    const extraRoutes = _.get(options, 'expressController.extraRoutes', false);
+    const extraRoutes = options?.expressController?.extraRoutes || false;
     if (extraRoutes) {
         require(`./kube-native/${options.expressController.path || route}`).init(router, controller);
     }
@@ -104,7 +104,7 @@ function initExpressController(route, options) {
 
 
 module.exports = {
-    routes: _.keys(supportedRoutes).map((ep) => `kube-native/${ep}`),
+    routes: Object.keys(supportedRoutes).map((ep) => `kube-native/${ep}`),
 
     createRoute: (expressApp) => {
         _.forOwn(supportedRoutes, (options, route) => {

package/service.yaml

@@ -1 +1 @@
-version: 2.0.0
+version: 2.1.0

package/infra/logging.js

@@ -1,36 +0,0 @@
-'use strict';
-
-const Promise = require('bluebird');
-const config  = require('../config');
-const cflogs  = require('cf-logs');
-cflogs.init(config.logger);
-const logger  = cflogs.Logger("codefresh");
-
-
-class Logging {
-
-    constructor() {
-
-    }
-
-    init(config) {
-        return Promise.resolve()
-            .then(() => {
-
-                // override the default console.log
-                console.log   = function (message) {
-                    logger.log('info', message);
-                };
-                console.error = function (message) {
-                    logger.log('error', message);
-                };
-            });
-    }
-
-    stop() {
-        return Promise.resolve();
-    }
-}
-
-
-module.exports = new Logging();