@codefresh-io/kube-integration 1.33.5 → 2.0.0

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

@@ -3,16 +3,16 @@ description: Helm Chart for Kube Integration
 name: kube-integration
 version: 1.0.0
 keywords:
-- codefresh
-- kube-integration
+  - codefresh
+  - kube-integration
 home: https://codefresh.io/
 icon: https://avatars1.githubusercontent.com/u/11412079?v=3
 sources:
-- https://github.com/codefresh-io/kube-integration
+  - https://github.com/codefresh-io/kube-integration
 maintainers:
   - name: codefresh
     url: https://codefresh-io.github.io/
 dependencies:
   - name: cf-common
     repository: oci://quay.io/codefresh/charts
-    version: "0.23.0"
+    version: "0.31.0"

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

@@ -11,7 +11,6 @@ global:
   codefresh: codefresh   # On-prem chart name (all subcharts use this name to access secrets and configmaps)
   kubeIntegrationPort: 9000
   kubeIntegrationService: kube-integration
-  newrelicLicenseKey: ""
   postgresDatabase: ""
   postgresHostname: ""
   postgresHostnameSecretKeyRef: {}
@@ -158,6 +157,8 @@ container:
     NODE_ENV: kubernetes
     PORT: '{{ .Values.global.kubeIntegrationPort }}'
     SERVICE_NAME: '{{ include (printf "cf-common-%s.names.name" (index .Subcharts "cf-common").Chart.Version) . }}'
+    URI_QUERY_MAX_ITEMS: "{{ .Values.global.uriQueryMaxItems }}"
+    URI_QUERY_ARRAY_MAX_ITEMS: "{{ .Values.global.uriQueryArrayMaxItems }}"
 
   extraEnv:
     EVENTBUS_URI: $(RABBITMQ_PROTOCOL)://$(RABBITMQ_USERNAME):$(RABBITMQ_PASSWORD)@$(RABBITMQ_HOSTNAME)
@@ -211,8 +212,6 @@ secrets:
       RABBITMQ_USERNAME: "{{ coalesce .Values.rabbitmqUsername .Values.global.rabbitmqUsername }}"
       RABBITMQ_PROTOCOL: '{{ coalesce .Values.rabbitmqProtocol .Values.global.rabbitmqProtocol "amqp" }}'
 
-      NEWRELIC_LICENSE_KEY: '{{ .Values.global.newrelicLicenseKey }}'
-
 service:
   main:
     enabled: true

package/.nvmrc

@@ -1 +1 @@
-v22.21.0
+v24

package/CODEOWNERS

@@ -1,7 +1,9 @@
-# These owners will be the default owners for everything in
-# the repo. Unless a later match takes precedence,
-# @global-owner1 and @global-owner2 will be requested for
-# review when someone opens a pull request.
-*   yaroslav@codefresh.io yaroslav.drachenko@octopus.com denis@codefresh.io zhenya.tikhonov@octopus.com
+# https://github.com/orgs/codefresh-io/teams/r-d/teams
+# use teams and email addresses instead of GitHub usernames
+*                   @codefresh-io/Codefresh_Developers
 
-/  yaroslav@codefresh.io yaroslav.drachenko@octopus.com pavel@codefresh.io denis@codefresh.io
+# team leads are responsible for the codeowners file and the migration scripts
+CODEOWNERS          @codefresh-io/teamleads
+
+# helm charts for DevOps team
+.deploy/            @codefresh-io/Codefresh_Developers @codefresh-io/DevOps

package/Dockerfile

@@ -1,37 +1,27 @@
-FROM --platform=$BUILDPLATFORM node:22.21.1-alpine3.23
+# DHI source: https://hub.docker.com/repository/docker/octopusdeploy/dhi-node/customizations/cz_1xiye92r2ry49
+ARG DHI_NODE_TAG=24-debian13
+ARG DHI_NODE_CUSTOMIZATION=cf-kube-integration-node24-debian-13
 
-ARG TARGETPLATFORM
-ARG TARGETARCH
-RUN printf "Building for TARGETPLATFORM=${TARGETPLATFORM}" \
-    && printf ", TARGETARCH=${TARGETARCH}"
 
+FROM octopusdeploy/dhi-node:${DHI_NODE_TAG}-dev AS prod-deps
 WORKDIR /kube-integration
-
-RUN apk --no-cache update && apk add --no-cache bash openssh-client curl
-
+RUN apt update \
+    && apt install -y \
+    make \
+    python3 \
+    g++ \
+    git
 COPY package.json yarn.lock ./
+RUN yarn install --production --frozen-lockfile
+RUN mkdir /logs
 
-# install required binaries
-RUN apk add --no-cache --virtual deps make python3 g++ krb5-dev git && \
-    rm -rf node_modules &&  \
-    npm uninstall -g npm && \
-    yarn install --production --frozen-lockfile && \
-    yarn cache clean && \
-    apk del deps && apk upgrade && \
-    rm -rf /tmp/*
-
-# copy app files
-COPY . .
 
-#add codefresh user and change work directories permissions
-RUN adduser -D -h /home/cfu -s /bin/bash cfu && \
-    mkdir /logs && \
-    chgrp -R $(id -g cfu) /kube-integration /logs && \
-    chmod -R g+rwX /kube-integration /logs
-USER cfu
-
-#application server
+FROM octopusdeploy/dhi-node:${DHI_NODE_TAG}_${DHI_NODE_CUSTOMIZATION}@sha256:3a831f3711c6349932c94c9475157444aa1c1452879f34a5d79bcc79e1985b9e 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/
+COPY --chown=node:node --chmod=755 --from=prod-deps /kube-integration/node_modules ./node_modules
+COPY --chown=node:node --chmod=755 . .
+USER node
 EXPOSE 9000
-
-# run application
 CMD ["node", "--max-http-header-size=360000", "index.js"]

package/config/index.js

@@ -68,10 +68,6 @@ base.httpLogger = {
     format: 'dev'
 };
 
-base.newrelic = {
-    license_key: process.env.NEWRELIC_LICENSE_KEY
-};
-
 base.eventbus = {
     uri: process.env.EVENTBUS_URI || 'amqp://codefresh.dev',
     reconnectInterval: process.env.EVENTBUS_INTERVAL || 5,
@@ -89,6 +85,11 @@ base.postgres = {
 base.helm = {
     maxHelmHistorySize: process.env.MAX_HELM_HISTORY_SIZE, // If set, limits history in release
 };
+base.queryString = {
+    uriQueryMaxItems: process.env.URI_QUERY_MAX_ITEMS || 200,
+    uriQueryArrayMaxItems: process.env.URI_QUERY_ARRAY_MAX_ITEMS || 100
+}
+
 
 require(`./environment/kubernetes`)(base);
 

package/infra/eventbus.js

@@ -2,7 +2,6 @@
 
 const Promise   = require('bluebird');
 const eventBus  = require('@codefresh-io/eventbus');
-const monitor   = require('@codefresh-io/cf-monitor');
 const logger    = require('cf-logs').Logger("codefresh:infra:eventbus");
 const config    = require('./../config');
 
@@ -53,7 +52,7 @@ class Eventbus {
                 eventBus.on('error', (err) => {
                     const error = new Error(`Eventbus error: ${err.stack}`);
                     logger.error(error.stack);
-                    monitor.noticeError(error);
+                    // monitor.noticeError(error); // Used earlier to report an error to New Relic
                 });
 
                 return deferred.promise;
@@ -93,7 +92,7 @@ class Eventbus {
         eventBus.publish(name, data)
             .catch((err) => {
                 logger.error(err.stack);
-                monitor.noticeError(err);
+                // monitor.noticeError(err); // Used earlier to report an error to New Relic
             })
             .done();
     }

package/infra/express.js

@@ -1,6 +1,5 @@
 'use strict';
 
-const monitor = require('@codefresh-io/cf-monitor');
 const Promise = require('bluebird');
 const express = require('express');
 const compression = require('compression');
@@ -13,6 +12,7 @@ const _ = require('lodash');
 const middlewares = require('./middleware');
 const httpInfra = require('@codefresh-io/http-infra');
 const CFError = require('cf-errors');
+const qs = require('qs')
 
 
 class Express {
@@ -59,6 +59,12 @@ class Express {
         return Promise.resolve()
             .then(() => {
                 const app = express();
+                app.set('query parser', (str) => {
+                    return qs.parse(str, {
+                        allowPrototypes: true,
+                        parameterLimit: this.config.queryString.uriQueryMaxItems,
+                        arrayLimit: this.config.queryString.uriQueryArrayMaxItems
+                    })});
                 app.use(httpInfra.newDomainMiddleware());
                 app.use(cookieParser());
                 app.use(compression());
@@ -136,7 +142,7 @@ class Express {
                 app.use((err, req, res, next) => {
                     if (err instanceof CFError) {
                         if (!err.getFirstValue("recognized")) {
-                            monitor.noticeError(err);
+                            // monitor.noticeError(err); // Used earlier to report an error to New Relic
                         }
                     }
                     logger.error(err.stack);

package/infra/index.js

@@ -2,8 +2,6 @@
 
 const logging       = require('./logging');
 const config  = require('../config');
-const monitor = require('@codefresh-io/cf-monitor');
-monitor.init();
 const Promise       = require('bluebird'); // jshint ignore:line
 const processEvents = require('./process-events');
 const express       = require('./express');

package/lib/kube-native/deployment/deploy.builder.js

@@ -1,7 +1,6 @@
 'use strict';
 
 const _           = require('lodash');
-const uuidv4      = require('uuid/v4');
 const BaseBuilder = require('./../../kube-native/builder.base');
 const CFError = require('cf-errors');
 
@@ -52,7 +51,7 @@ class DeployBuilder extends BaseBuilder {
 
     _buildAnnotations() {
         this._shouldMarkAnnotations() && this.updateTemplate('spec.template.metadata.annotations', {
-            forceRedeployUniqId: uuidv4(),
+            forceRedeployUniqId: globalThis.crypto.randomUUID(),
         });
         return this;
     }
@@ -176,7 +175,7 @@ class DeployBuilder extends BaseBuilder {
 
     _buildLabels() {
         this.shouldMarkWithLabels() && this.updateTemplate('spec.template.metadata.labels', {
-            ['io.codefresh.auto-generated']: uuidv4(),
+            ['io.codefresh.auto-generated']: globalThis.crypto.randomUUID(),
             ['io.codefresh.generated-at']: Date.now().toString()
         });
         this.updateTemplate('metadata.labels', this._getTemplateLabels());

package/lib/kube-native/service/svc.builder.js

@@ -2,7 +2,6 @@
 
 const _           = require('lodash');
 const BaseBuilder = require('./../../kube-native/builder.base');
-const uuidv4      = require('uuid/v4');
 
 class ServiceBuilder extends BaseBuilder {
 
@@ -57,11 +56,11 @@ class ServiceBuilder extends BaseBuilder {
 
     _buildLabels(){
         this.shouldMarkWithLabels() && this.updateTemplate('metadata.labels', {
-            ['io.codefresh.auto-generated']: uuidv4(),
+            ['io.codefresh.auto-generated']: globalThis.crypto.randomUUID(),
             ['io.codefresh.generated-at']: Date.now().toString()
         });
         return this;
     }
 }
 
-module.exports = ServiceBuilder;
+module.exports = ServiceBuilder;

package/lib/kube-native/service/svc.controller.js

@@ -106,7 +106,6 @@ class ServiceController extends ResourсeController {
                                     })
                             })
                             .catch((err) => {
-                                // todo: report to new relic
                                 const analyzedStatus = this._analyzeStatus({ svc });
                                 return _.merge(svc.getBasicData(), { globalStatus: analyzedStatus });
                             });

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.33.5",
+  "version": "2.0.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": ">=20.18.0"
+    "node": "^24"
   },
   "author": "Oleg Sucharevich <olegs@codefresh.io>",
   "license": "ISC",
@@ -31,33 +31,33 @@
     "openid-client": "^4.9.0",
     "tough-cookie": "4.1.3",
     "@kubernetes/client-node": "0.22.1",
-    "**/request/form-data": "^2.4.5"
+    "**/request/form-data": "^2.4.5",
+    "**/request/qs": "6.14.2"
   },
   "dependencies": {
-    "@codefresh-io/cf-monitor": "0.0.30",
-    "@codefresh-io/docker-reference": "^0.0.5",
-    "@codefresh-io/eventbus": "2.4.0",
-    "@codefresh-io/http-infra": "1.8.14",
-    "bluebird": "^3.5.0",
-    "cf-errors": "^0.1.16",
-    "cf-logs": "^1.1.24",
-    "compression": "^1.6.2",
-    "cookie-parser": "^1.4.3",
+    "@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",
-    "express": "^4.21.0",
+    "express": "^4.22.1",
     "google-protobuf": "^3.5.0",
     "js-yaml": "^3.13.1",
     "kube-config-builder": "^1.1.3",
     "kubernetes-client": "^9.0.0",
-    "lodash": "~4.17.21",
+    "lodash": "^4.18.1",
     "method-override": "^2.3.9",
-    "morgan": "^1.10.0",
+    "morgan": "^1.10.1",
     "nock": "^12.0.3",
-    "nodegistry": "^1.2.5",
+    "nodegistry": "^1.3.1",
     "object-hash": "^1.2.0",
+    "qs": "^6.15.1",
     "request": "^2.88.2",
-    "request-promise": "^4.2.6",
-    "uuid": "^3.1.0"
+    "request-promise": "^4.2.6"
   },
   "devDependencies": {
     "chai": "^3.5.0",

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

@@ -4,18 +4,20 @@ const _                          = require('lodash');
 const Promise                    = require('bluebird');
 const {
     registries: { GcrRegistry, EcrRegistry, StandardRegistry }
-  } = require('nodegistry');
+} = require('nodegistry');
+const { getAuthenticatedEntity } = require('@codefresh-io/http-infra');
 const ResponseHandler            = require('./../../../helpers/ResponseHandler');
 const BaseCrudController         = require('./../../crud.base.controller');
 const globalLabels               = require('./../../../../lib/labels');
 const secretLabels               = require('./../../../../lib/kube-native/secret/secret.labels');
 const CFError = require('cf-errors');
 
-function create(options) {
+async function create(options) {
     switch (options.kind) {
         case 'google':
             return new GcrRegistry(options);
         case 'amazon':
+            options.validateAwsRegion = await getAuthenticatedEntity().evaluateFeatureFlag('enableAwsRegionStrictValidation')
             return new EcrRegistry(options);
         case 'standard':
             return new StandardRegistry(options);
@@ -70,8 +72,8 @@ class Controller extends BaseCrudController {
                 }
                 return registry;
             })
-            .then((registry) => {
-                const manager = create(registry);
+            .then(async (registry) => {
+                const manager = await create(registry);
                 return Promise.all([
                     manager.getDomain(),
                     manager.getCredentials(),

package/service.yaml

@@ -1,2 +1 @@
-version: 1.33.5
-
+version: 2.0.0

package/newrelic.js

@@ -1,35 +0,0 @@
-'use strict';
-
-const config  = require('./config');
-
-
-/**
- * New Relic agent configuration.
- *
- * See lib/config.defaults.js in the agent distribution for a more complete
- * description of configuration variables and their potential values.
- */
-exports.config = {
-  /**
-   * Array of application names.
-   */
-  app_name: [`${config.name}[${config.env}]`],
-  /**
-   * Your New Relic license key.
-   */
-  license_key: config.newrelic.license_key,
-
-  logging: {
-    /**
-     * Level at which to log. 'trace' is most useful to New Relic when diagnosing
-     * issues with the agent, 'info' and higher will impose the least overhead on
-     * production applications.
-     */
-    enabled: false,
-    level: 'info'
-  },
-
-  error_collector: {
-      ignore_status_codes: ['400-600']
-  }
-};