@codefresh-io/kube-integration 1.24.4 → 1.24.7

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

@@ -107,7 +107,6 @@ spec:
               name: "{{ .Release.Name }}-{{ .Values.global.codefresh }}"
               key: rabbitmq-username
         - name: EVENTBUS_URI
-          #value: 'amqp://{{ .Values.global.rabbitmqUsername }}:{{ .Values.global.rabbitmqPassword }}@{{ default (printf "%s-%s" .Release.Name .Values.global.rabbitService) .Values.global.rabbitmqHostname }}'
           value: amqp://$(RABBIT_USER):$(RABBIT_PASSWORD)@{{ default (printf "%s-%s" .Release.Name .Values.global.rabbitService) .Values.global.rabbitmqHostname }}
         - name: POSTGRES_HOST
           value: {{ default (printf "%s-%s" .Release.Name .Values.global.postgresService) .Values.global.postgresHostname | quote }}

package/Dockerfile

@@ -1,13 +1,15 @@
-FROM node:12.22-alpine3.15
+FROM node:12.22.12-alpine
 
 WORKDIR /kube-integration
 
+RUN apk --no-cache update && apk add --no-cache bash openssh-client curl
 
 COPY package.json yarn.lock ./
 
 # install required binaries
-RUN apk update && apk add --no-cache --virtual deps make g++ krb5-dev bash git openssh-client && \
-    rm -rf node_modules && yarn install --production --frozen-lockfile && \
+RUN apk add --no-cache --virtual deps make python3 g++ krb5-dev git && \
+    rm -rf node_modules &&  \
+    yarn install --production --frozen-lockfile && \
     yarn cache clean && \
     apk del deps && apk upgrade && \
     rm -rf /tmp/*
@@ -15,9 +17,12 @@ RUN apk update && apk add --no-cache --virtual deps make g++ krb5-dev bash git o
 # copy app files
 COPY . .
 
-RUN mkdir /logs && \
-    chgrp -R 0 /kube-integration /logs && \
+#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
 EXPOSE 9000

package/infra/express.js

@@ -11,7 +11,6 @@ const morgan = require('morgan');
 const logger = require('cf-logs').Logger("codefresh:infra:express");
 const api = require('../server/api');
 const _ = require('lodash');
-const expressValidator = require('express-validator');
 const middlewares = require('./middleware');
 const httpInfra = require('@codefresh-io/http-infra');
 const CFError = require('cf-errors');
@@ -66,7 +65,6 @@ class Express {
                 app.use(compression());
                 app.use(bodyParser.urlencoded({ extended: true }));
                 app.use(bodyParser.json());
-                app.use(expressValidator([]));
                 app.use(methodOverride());
 
                 if (this.config.httpLogger) {

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.24.4",
+  "version": "1.24.7",
   "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": "12.22.11"
+    "node": "12.22.12"
   },
   "author": "Oleg Sucharevich <olegs@codefresh.io>",
   "license": "ISC",
@@ -33,22 +33,22 @@
     "lodash": "~4.17.21",
     "normalize-url": "4.5.1",
     "shelljs": "0.8.5",
-    "node-forge": "1.3.0"
+    "node-forge": "1.3.0",
+    "openid-client": "^4.9.0"
   },
   "dependencies": {
     "@codefresh-io/docker-reference": "^0.0.5",
-    "@codefresh-io/eventbus": "1.4.1",
+    "@codefresh-io/eventbus": "1.4.2",
     "@codefresh-io/http-infra": "^1.8.11",
     "bluebird": "^3.5.0",
     "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#072ce2b419bb615a9567d253139431ca3c3adf17",
+    "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",
     "express": "^4.15.3",
-    "express-validator": "^3.2.0",
     "google-protobuf": "^3.5.0",
     "js-yaml": "^3.13.1",
     "kube-config-builder": "^1.1.3",

package/service.yaml

@@ -1 +1 @@
-version: 1.25.12
+version: 1.25.18