@codefresh-io/kube-integration 1.33.4 → 1.33.6

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

@@ -158,6 +158,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)

package/.nvmrc

@@ -1 +1 @@
-v22.12.0
+v22

package/Dockerfile

@@ -1,37 +1,27 @@
-FROM --platform=$BUILDPLATFORM node:22.16.0-alpine3.22
+# DHI source: https://hub.docker.com/repository/docker/octopusdeploy/dhi-node/customizations/4261306004513414271
+ARG DHI_NODE_TAG=22.22.0-alpine3.22
+ARG DHI_NODE_CUSTOMIZATION=cf-kube-integration-node22-alpine
 
-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 apk add --no-cache \
+    make \
+    python3 \
+    g++ \
+    krb5-dev \
+    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} 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

@@ -89,6 +89,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/express.js

@@ -13,6 +13,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 +60,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());

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.33.4",
+  "version": "1.33.6",
   "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": "^22"
   },
   "author": "Oleg Sucharevich <olegs@codefresh.io>",
   "license": "ISC",
@@ -31,10 +31,11 @@
     "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.1"
   },
   "dependencies": {
-    "@codefresh-io/cf-monitor": "0.0.30",
+    "@codefresh-io/cf-monitor": "12.15.0",
     "@codefresh-io/docker-reference": "^0.0.5",
     "@codefresh-io/eventbus": "2.4.0",
     "@codefresh-io/http-infra": "1.8.14",
@@ -44,7 +45,7 @@
     "compression": "^1.6.2",
     "cookie-parser": "^1.4.3",
     "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",
@@ -57,7 +58,8 @@
     "object-hash": "^1.2.0",
     "request": "^2.88.2",
     "request-promise": "^4.2.6",
-    "uuid": "^3.1.0"
+    "uuid": "^3.1.0",
+    "qs": "^6.14.1"
   },
   "devDependencies": {
     "chai": "^3.5.0",

package/service.yaml

@@ -1,2 +1,2 @@
-version: 1.33.4
+version: 1.33.6