From fe9e57863a54d5373af27845a5d30bfe590bc822 Mon Sep 17 00:00:00 2001 From: Valeriy Svydenko Date: Mon, 20 Jan 2025 15:03:50 +0200 Subject: [PATCH 1/3] chore: update openvsx-server to v0.19.0 Signed-off-by: Valeriy Svydenko --- .../build/dockerfiles/Dockerfile | 2 + .../build/dockerfiles/application.yaml | 73 ++++++++++++++++++- dependencies/job-config.json | 4 +- 3 files changed, 76 insertions(+), 3 deletions(-) diff --git a/dependencies/che-plugin-registry/build/dockerfiles/Dockerfile b/dependencies/che-plugin-registry/build/dockerfiles/Dockerfile index 847506e810..8c60806786 100644 --- a/dependencies/che-plugin-registry/build/dockerfiles/Dockerfile +++ b/dependencies/che-plugin-registry/build/dockerfiles/Dockerfile @@ -116,9 +116,11 @@ RUN \ echo "======================" RUN chmod 777 /var/run/postgresql && \ + mkdir -p /tmp/extensions && \ initdb && \ /usr/local/bin/import_vsix.sh && \ chmod -R 777 /tmp/file && \ + chmod -R 777 /tmp/extensions && \ rm /var/lib/pgsql/15/data/database/postmaster.pid && \ rm /var/run/postgresql/.s.PGSQL* && \ rm /tmp/.s.PGSQL* && \ diff --git a/dependencies/che-plugin-registry/build/dockerfiles/application.yaml b/dependencies/che-plugin-registry/build/dockerfiles/application.yaml index fa0f7820bd..55a4c1ad6f 100644 --- a/dependencies/che-plugin-registry/build/dockerfiles/application.yaml +++ b/dependencies/che-plugin-registry/build/dockerfiles/application.yaml @@ -1,5 +1,12 @@ +logging: + pattern: + level: '%5p [${spring.application.name:},%X{traceId:-},%X{spanId:-}]' + server: port: 9000 + jetty: + threads: + max-queue-capacity: 100 spring: profiles: @@ -43,12 +50,76 @@ management: health: probes: enabled: true + endpoints: + web: + exposure: + include: + - health + - metrics + - prometheus +org: + jobrunr: + job-scheduler: + enabled: true + background-job-server: + enabled: true + worker-count: 2 + dashboard: + enabled: false + database: + type: sql + miscellaneous: + allow-anonymous-data-usage: false + +bucket4j: + enabled: true + filters: + - cache-name: buckets + url: '/api/-/(namespace/create|publish)' + http-response-headers: + Access-Control-Allow-Origin: '*' + Access-Control-Expose-Headers: X-Rate-Limit-Retry-After-Seconds, X-Rate-Limit-Remaining + rate-limits: + - cache-key: getParameter("token") + bandwidths: + - capacity: 15 + time: 1 + unit: seconds + - cache-name: buckets + url: '/vscode/asset/.*/.*/.*/Microsoft.VisualStudio.Services.Icons.Default' + http-response-headers: + Access-Control-Allow-Origin: '*' + Access-Control-Expose-Headers: X-Rate-Limit-Retry-After-Seconds, X-Rate-Limit-Remaining + rate-limits: + - cache-key: getRemoteAddr() + bandwidths: + - capacity: 75 + time: 1 + unit: seconds + - cache-name: buckets + url: '/vscode/(?!asset/.*/.*/.*/Microsoft.VisualStudio.Services.Icons.Default).*|/api/(?!(.*/.*/review(/delete)?)|(-/(namespace/create|publish))).*' + http-response-headers: + Access-Control-Allow-Origin: '*' + Access-Control-Expose-Headers: X-Rate-Limit-Retry-After-Seconds, X-Rate-Limit-Remaining + rate-limits: + - cache-key: getRemoteAddr() + bandwidths: + - capacity: 15 + time: 1 + unit: seconds ovsx: elasticsearch: enabled: false clear-on-start: true + extension-control: + update-on-start: true + integrity: + key-pair: create # create, renew, delete, 'undefined' databasesearch: enabled: true registry: - version: 'v0.15.8' + version: 'v0.19.0' + storage: + local: + directory: /tmp/extensions diff --git a/dependencies/job-config.json b/dependencies/job-config.json index 1bfdb24d40..cc0a46e083 100644 --- a/dependencies/job-config.json +++ b/dependencies/job-config.json @@ -577,8 +577,8 @@ "CHE_OPENVSX_TAG": { "3.16": "che-openvsx-v0.15.8", "3.17": "che-openvsx-v0.15.8", - "3.18": "che-openvsx-v0.15.8", - "3.x": "che-openvsx-v0.15.8" + "3.18": "che-openvsx-v0.19.0", + "3.x": "che-openvsx-v0.19.0" }, "OPENSHIFT_VERSIONS_SUPPORTED": { "3.16": [ From c46aba6b57ac63a18904b12d0f1910c2e92570d1 Mon Sep 17 00:00:00 2001 From: Valeriy Svydenko Date: Mon, 20 Jan 2025 16:10:56 +0200 Subject: [PATCH 2/3] fix build Signed-off-by: Valeriy Svydenko --- dependencies/che-plugin-registry/openvsx-sync.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies/che-plugin-registry/openvsx-sync.json b/dependencies/che-plugin-registry/openvsx-sync.json index f18eb5d8b7..9c56153b64 100644 --- a/dependencies/che-plugin-registry/openvsx-sync.json +++ b/dependencies/che-plugin-registry/openvsx-sync.json @@ -245,7 +245,7 @@ }, { "id": "Zowe.cics-extension-for-zowe", - "version": "2.3.7" + "version": "3.3.0" }, { "id": "IBM.zopeneditor", From 143265646d9a417598fe4916e61b81e2f4be05b5 Mon Sep 17 00:00:00 2001 From: Valeriy Svydenko Date: Mon, 20 Jan 2025 18:30:15 +0200 Subject: [PATCH 3/3] disable backet4j Signed-off-by: Valeriy Svydenko --- .../build/dockerfiles/application.yaml | 36 +------------------ 1 file changed, 1 insertion(+), 35 deletions(-) diff --git a/dependencies/che-plugin-registry/build/dockerfiles/application.yaml b/dependencies/che-plugin-registry/build/dockerfiles/application.yaml index 55a4c1ad6f..06ed50645a 100644 --- a/dependencies/che-plugin-registry/build/dockerfiles/application.yaml +++ b/dependencies/che-plugin-registry/build/dockerfiles/application.yaml @@ -72,41 +72,7 @@ org: allow-anonymous-data-usage: false bucket4j: - enabled: true - filters: - - cache-name: buckets - url: '/api/-/(namespace/create|publish)' - http-response-headers: - Access-Control-Allow-Origin: '*' - Access-Control-Expose-Headers: X-Rate-Limit-Retry-After-Seconds, X-Rate-Limit-Remaining - rate-limits: - - cache-key: getParameter("token") - bandwidths: - - capacity: 15 - time: 1 - unit: seconds - - cache-name: buckets - url: '/vscode/asset/.*/.*/.*/Microsoft.VisualStudio.Services.Icons.Default' - http-response-headers: - Access-Control-Allow-Origin: '*' - Access-Control-Expose-Headers: X-Rate-Limit-Retry-After-Seconds, X-Rate-Limit-Remaining - rate-limits: - - cache-key: getRemoteAddr() - bandwidths: - - capacity: 75 - time: 1 - unit: seconds - - cache-name: buckets - url: '/vscode/(?!asset/.*/.*/.*/Microsoft.VisualStudio.Services.Icons.Default).*|/api/(?!(.*/.*/review(/delete)?)|(-/(namespace/create|publish))).*' - http-response-headers: - Access-Control-Allow-Origin: '*' - Access-Control-Expose-Headers: X-Rate-Limit-Retry-After-Seconds, X-Rate-Limit-Remaining - rate-limits: - - cache-key: getRemoteAddr() - bandwidths: - - capacity: 15 - time: 1 - unit: seconds + enabled: false ovsx: elasticsearch: