From 4c7f26fdec55f06a796b0e193960f8bc989534cc Mon Sep 17 00:00:00 2001 From: adrobuta Date: Wed, 20 Nov 2024 09:23:33 +0200 Subject: [PATCH 1/3] fix: bump snyk-docker-plugin * redhat-content-manifests content sets parsing UNIFY-387 * optional python dependencies that are being over connected --- .snyk | 6 ++++++ package-lock.json | 8 ++++---- package.json | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.snyk b/.snyk index a21481cf5..da1097a2c 100644 --- a/.snyk +++ b/.snyk @@ -32,4 +32,10 @@ ignore: No upstream fix available expires: 2024-12-08T12:00:00.000Z created: 2024-11-08T12:00:00.000Z + SNYK-JS-JSONPATHPLUS-7945884: + - '*': + reason: >- + Waiting for @kubernetes/client-node upgrade + expires: 2024-12-08T12:00:00.000Z + created: 2024-11-20T12:00:00.000Z patch: {} diff --git a/package-lock.json b/package-lock.json index 2e000b6ca..e8360adf7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,7 +20,7 @@ "packageurl-js": "^1.2.1", "sleep-promise": "^9.1.0", "snyk-config": "5.3.0", - "snyk-docker-plugin": "6.13.0", + "snyk-docker-plugin": "6.13.0-hotfix", "source-map-support": "^0.5.21", "tunnel": "0.0.6", "typescript": "4.9.5", @@ -8868,9 +8868,9 @@ } }, "node_modules/snyk-docker-plugin": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-6.13.0.tgz", - "integrity": "sha512-xgW1sXs/Y5q9Wg011t0LkA3YqrWkt5J2BEINLRssXkDQhm2ijOvu1YS7hJMt/WTLm0kvk12VmnBn11cWIIzeZg==", + "version": "6.13.0-hotfix", + "resolved": "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-6.13.0-hotfix.tgz", + "integrity": "sha512-gjcvpgkvD830QpU0p3S3yhfOdI7+oAVyBoHMhrIRX+wMEII45/Gi9081YWSctdxDUR2wl6orDyGKLPS4Sk/f+w==", "dependencies": { "@snyk/composer-lockfile-parser": "^1.4.1", "@snyk/dep-graph": "^2.8.1", diff --git a/package.json b/package.json index 166ad3610..d88d61843 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "packageurl-js": "^1.2.1", "sleep-promise": "^9.1.0", "snyk-config": "5.3.0", - "snyk-docker-plugin": "6.13.0", + "snyk-docker-plugin": "6.13.0-hotfix", "source-map-support": "^0.5.21", "tunnel": "0.0.6", "typescript": "4.9.5", From bf53ca7c36dcbdace92ca524be7f0d6934d3d042 Mon Sep 17 00:00:00 2001 From: Katie Armstrong Date: Fri, 29 Nov 2024 15:18:51 +0000 Subject: [PATCH 2/3] fix: upgrade to ubi9.5 --- Dockerfile.ubi9 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.ubi9 b/Dockerfile.ubi9 index eeb07e542..d23991e6a 100644 --- a/Dockerfile.ubi9 +++ b/Dockerfile.ubi9 @@ -31,14 +31,14 @@ RUN npm run build #--------------------------------------------------------------------- # STAGE 3: Install containers-common to obtain configuration files #--------------------------------------------------------------------- -FROM --platform=linux/amd64 registry.access.redhat.com/ubi9/ubi:9.4 AS containers-common +FROM --platform=linux/amd64 registry.access.redhat.com/ubi9/ubi:9.5 AS containers-common RUN dnf install -y containers-common #--------------------------------------------------------------------- # STAGE 4: Build the kubernetes-monitor final image #--------------------------------------------------------------------- -FROM --platform=linux/amd64 registry.access.redhat.com/ubi9/ubi:9.4 +FROM --platform=linux/amd64 registry.access.redhat.com/ubi9/ubi:9.5 ARG NODE_18_LATEST_VERSION ARG NODE_18_LATEST_VERSION_TAR_GZ_FILE_SHASUM256 From a05134ce36f60d8c9c663a1b91a073068da48f37 Mon Sep 17 00:00:00 2001 From: Katie Armstrong Date: Fri, 29 Nov 2024 15:13:07 +0000 Subject: [PATCH 3/3] fix: update k8s client --- package-lock.json | 22 +++++++++++----------- package.json | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index e8360adf7..d76753656 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,7 +7,7 @@ "name": "@snyk/kubernetes-monitor", "license": "private", "dependencies": { - "@kubernetes/client-node": "^0.22.2", + "@kubernetes/client-node": "^0.22.3", "@snyk/dep-graph": "^2.9.0", "async": "^3.2.6", "aws-sdk": "^2.1692.0", @@ -1708,14 +1708,14 @@ } }, "node_modules/@kubernetes/client-node": { - "version": "0.22.2", - "resolved": "https://registry.npmjs.org/@kubernetes/client-node/-/client-node-0.22.2.tgz", - "integrity": "sha512-PPyzUVunPtgISnWNkCTSLp1SoZ3I13XOanrc8XAQRKp8XTnDF7VT9Sf3/haFmgnpONe4ORCtqrWueGp5fl8yzw==", + "version": "0.22.3", + "resolved": "https://registry.npmjs.org/@kubernetes/client-node/-/client-node-0.22.3.tgz", + "integrity": "sha512-dG8uah3+HDJLpJEESshLRZlAZ4PgDeV9mZXT0u1g7oy4KMRzdZ7n5g0JEIlL6QhK51/2ztcIqURAnjfjJt6Z+g==", "dependencies": { "byline": "^5.0.0", "isomorphic-ws": "^5.0.0", "js-yaml": "^4.1.0", - "jsonpath-plus": "^10.0.0", + "jsonpath-plus": "^10.2.0", "request": "^2.88.0", "rfc4648": "^1.3.0", "stream-buffers": "^3.0.2", @@ -7014,13 +7014,13 @@ ] }, "node_modules/jsonpath-plus": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/jsonpath-plus/-/jsonpath-plus-10.1.0.tgz", - "integrity": "sha512-gHfV1IYqH8uJHYVTs8BJX1XKy2/rR93+f8QQi0xhx95aCiXn1ettYAd5T+7FU6wfqyDoX/wy0pm/fL3jOKJ9Lg==", + "version": "10.2.0", + "resolved": "https://registry.npmjs.org/jsonpath-plus/-/jsonpath-plus-10.2.0.tgz", + "integrity": "sha512-T9V+8iNYKFL2n2rF+w02LBOT2JjDnTjioaNFrxRy0Bv1y/hNsqR/EBK7Ojy2ythRHwmz2cRIls+9JitQGZC/sw==", "dependencies": { - "@jsep-plugin/assignment": "^1.2.1", - "@jsep-plugin/regex": "^1.0.3", - "jsep": "^1.3.9" + "@jsep-plugin/assignment": "^1.3.0", + "@jsep-plugin/regex": "^1.0.4", + "jsep": "^1.4.0" }, "bin": { "jsonpath": "bin/jsonpath-cli.js", diff --git a/package.json b/package.json index d88d61843..ebf0bda3e 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "format:check": "prettier --check '{src,test}/**/*.{js,ts,json,yml}'" }, "dependencies": { - "@kubernetes/client-node": "^0.22.2", + "@kubernetes/client-node": "^0.22.3", "@snyk/dep-graph": "^2.9.0", "async": "^3.2.6", "aws-sdk": "^2.1692.0",