From 66cb1405a0571472429aa30124aca5142a721776 Mon Sep 17 00:00:00 2001 From: Vasily Ivanov Date: Sat, 11 Mar 2023 09:15:09 +0700 Subject: [PATCH 1/4] [gis-platform] snap-proof configure script ref: https://forum.snapcraft.io/t/jq-cant-read-some-files/17835/3 --- .../gis-platform/gis-platform-config/configure.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/charts/gis-platform/gis-platform-config/configure.sh b/charts/gis-platform/gis-platform-config/configure.sh index deb3ac5ca..b84d0023d 100755 --- a/charts/gis-platform/gis-platform-config/configure.sh +++ b/charts/gis-platform/gis-platform-config/configure.sh @@ -73,8 +73,8 @@ function configure() { exit 1 fi - create_or_update_layer "RemoteTileService" "$(jq --arg url "${tiles_api_url}" '.urlFormat=$url' layer/2gis.json)" - create_or_update_layer "RemoteTileService" "$(jq --arg url "${traffic_url}" '.urlFormat=$url' layer/2gis_traffic.json)" + create_or_update_layer "RemoteTileService" "$(cat layer/2gis.json | jq --arg url "${tiles_api_url}" '.urlFormat=$url')" + create_or_update_layer "RemoteTileService" "$(cat layer/2gis_traffic.json | jq --arg url "${traffic_url}" '.urlFormat=$url')" create_or_update_layer "LocalTileService" "$(cat layer/satellite_imagery.json)" echo "Configuring Map" @@ -84,15 +84,15 @@ function configure() { echo "Configuring Admin panel" $CURL -XPOST -H 'Content-Type: application/json' -d @configuration/AdminConfig.json "$GIS_PLATFORM_URL/sp/settings?urlPath=/admin" echo "Configuring map sharing" - jq --arg url "${GIS_PLATFORM_URL#http*://}" '.connection.ws_url=$url+"/sp/ws/"' configuration/SharedConfig.json | $CURL -XPOST -H 'Content-Type: application/json' -d @- "$GIS_PLATFORM_URL/sp/settings?urlPath=/shared" + cat configuration/SharedConfig.json | jq --arg url "${GIS_PLATFORM_URL#http*://}" '.connection.ws_url=$url+"/sp/ws/"' | $CURL -XPOST -H 'Content-Type: application/json' -d @- "$GIS_PLATFORM_URL/sp/settings?urlPath=/shared" - layer_names=$(jq --slurp --compact-output '[ .[].name ]' layer/*.json) + layer_names=$(cat layer/*.json | jq --slurp --compact-output '[ .[].name ]') echo "Share all basemaps: $layer_names" $CURL -XPOST -H 'Content-Type: application/json-patch+json' -d "$layer_names" "$GIS_PLATFORM_URL/sp/resources/layers/shareAll" echo "Setting autoshared list for all basemaps" for layer in layer/*.json; do - data=$(jq --compact-output '{name: .name, type: "layer"}' $layer) + data=$(cat $layer | jq --compact-output '{name: .name, type: "layer"}') $CURL -XPOST -H 'Content-Type: application/json-patch+json' -d "$data" "$GIS_PLATFORM_URL/sp/autosharedList" done } @@ -101,7 +101,7 @@ function configure() { function dump_configuration { for layer in layer/*.json; do - name=$(jq --raw-output .name $layer) + name=$(cat $layer | jq --raw-output .name) echo "Fetching layer $name" get_layer_config $name | jq . > "$TMPDIR/layer_${name}.json" done @@ -118,7 +118,7 @@ function dump_configuration { function config_diff() { # dump_configuration for layer in layer/*.json; do - name=$(jq --raw-output .name $layer) + name=$(cat $layer | jq --raw-output .name) diff -urBb $layer $TMPDIR/layer_$name.json done for config in configuration/*.json; do From b8f803e4939bcd09bdba084be31c81972029c5c4 Mon Sep 17 00:00:00 2001 From: Vasily Ivanov Date: Wed, 29 Mar 2023 14:35:24 +0700 Subject: [PATCH 2/4] [gis-platform] enable diff mode in configure script --- charts/gis-platform/gis-platform-config/configure.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/gis-platform/gis-platform-config/configure.sh b/charts/gis-platform/gis-platform-config/configure.sh index b84d0023d..360cf8759 100755 --- a/charts/gis-platform/gis-platform-config/configure.sh +++ b/charts/gis-platform/gis-platform-config/configure.sh @@ -116,7 +116,7 @@ function dump_configuration { #--------------- function config_diff() { -# dump_configuration + dump_configuration for layer in layer/*.json; do name=$(cat $layer | jq --raw-output .name) diff -urBb $layer $TMPDIR/layer_$name.json From 50454700518a0d338cc5f5d89610f243e23271f0 Mon Sep 17 00:00:00 2001 From: Vasily Ivanov Date: Thu, 30 Mar 2023 13:07:09 +0700 Subject: [PATCH 3/4] [gis-platform] Enable nginx worker processes autotune --- .../configs/portal/25-copy-nginx-conf-template.sh | 9 +++++++++ .../templates/gis-platform-portal-configmap.yaml | 2 ++ .../templates/gis-platform-portal-dep.yaml | 11 ++++++++++- 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 charts/gis-platform/configs/portal/25-copy-nginx-conf-template.sh diff --git a/charts/gis-platform/configs/portal/25-copy-nginx-conf-template.sh b/charts/gis-platform/configs/portal/25-copy-nginx-conf-template.sh new file mode 100644 index 000000000..c973bf7a8 --- /dev/null +++ b/charts/gis-platform/configs/portal/25-copy-nginx-conf-template.sh @@ -0,0 +1,9 @@ +#!/bin/sh +# vim:sw=4:ts=4:et + +set -e + +if [ -f "/etc/nginx/nginx.conf.template" ]; then + echo "Copying nginx.conf template" + cp /etc/nginx/nginx.conf.template /etc/nginx/nginx.conf +fi diff --git a/charts/gis-platform/templates/gis-platform-portal-configmap.yaml b/charts/gis-platform/templates/gis-platform-portal-configmap.yaml index 68bff4141..f87d406ea 100644 --- a/charts/gis-platform/templates/gis-platform-portal-configmap.yaml +++ b/charts/gis-platform/templates/gis-platform-portal-configmap.yaml @@ -11,3 +11,5 @@ data: {{- tpl (.Files.Get "configs/portal/nginx.conf.template") . | nindent 4 }} default.conf.template: |- {{- tpl (.Files.Get "configs/portal/default.conf.template") . | nindent 4 }} + 25-copy-nginx-conf-template.sh: |- + {{- .Files.Get "configs/portal/25-copy-nginx-conf-template.sh" | nindent 4 }} diff --git a/charts/gis-platform/templates/gis-platform-portal-dep.yaml b/charts/gis-platform/templates/gis-platform-portal-dep.yaml index df534af2d..ffca9e974 100644 --- a/charts/gis-platform/templates/gis-platform-portal-dep.yaml +++ b/charts/gis-platform/templates/gis-platform-portal-dep.yaml @@ -37,14 +37,23 @@ spec: - containerPort: 80 resources: {{- toYaml .Values.portal.resources | nindent 12 }} + {{- if (default true .Values.portal.nginx_workers_autotune) }} + env: + - name: NGINX_ENTRYPOINT_WORKER_PROCESSES_AUTOTUNE + value: "1" + {{- end }} volumeMounts: - name: {{ include "gis-platform-portal.name" . }}-configmap mountPath: /etc/nginx/templates/default.conf.template subPath: default.conf.template - name: {{ include "gis-platform-portal.name" . }}-configmap - mountPath: /etc/nginx/nginx.conf + mountPath: /etc/nginx/nginx.conf.template subPath: nginx.conf + - name: {{ include "gis-platform-portal.name" . }}-configmap + mountPath: /docker-entrypoint.d/25-copy-nginx-conf-template.sh + subPath: 25-copy-nginx-conf-template.sh volumes: - name: {{ include "gis-platform-portal.name" . }}-configmap configMap: name: {{ include "gis-platform-portal.fullname" . }} + defaultMode: 0755 From 925e48aa30df1ee6557d1b97325ea33e41b49c12 Mon Sep 17 00:00:00 2001 From: Vasily Ivanov Date: Thu, 2 Mar 2023 19:37:58 +0700 Subject: [PATCH 4/4] [gis-platform] version 2023.3.29 --- Breaking-Changes.md | 9 + charts/gis-platform/Chart.yaml | 2 +- charts/gis-platform/README.md | 8 +- .../configs/spcore/SPCore.json.template | 1 + .../configuration/MapConfig.json | 406 +++++++++++++++++- .../gis-platform-config/layer/2gis.json | 2 +- .../layer/2gis_traffic.json | 12 +- .../layer/satellite_imagery.json | 1 - charts/gis-platform/values.yaml | 8 +- 9 files changed, 412 insertions(+), 37 deletions(-) diff --git a/Breaking-Changes.md b/Breaking-Changes.md index 6143f2980..47dd8aae2 100644 --- a/Breaking-Changes.md +++ b/Breaking-Changes.md @@ -20,6 +20,15 @@ - Rename `portal.max_body_size` to `portal.maxBodySize` - Rename `portal.gzip_enabled` to `portal.gzip.enabled` +Before updating: + +- Disable `allowDirectAccess` option on layers `admin.2gis` and `admin.2gis_traffic` +- Set `subDomains` option to `[]` (empty array) in `admin.2gis_traffic` + +Those options did not work in previous releases, and were set to incorrect defaults. + +You can do this in admin web interface or by running `configure.sh -c -p` + ## [1.6.0] #### catalog-api - Rename diff --git a/charts/gis-platform/Chart.yaml b/charts/gis-platform/Chart.yaml index bdd479fb7..223f4fdb3 100644 --- a/charts/gis-platform/Chart.yaml +++ b/charts/gis-platform/Chart.yaml @@ -5,7 +5,7 @@ description: GIS Platform type: application version: 1.7.0 -appVersion: 2022.9.29 +appVersion: 2023.3.29 dependencies: - name: zookeeper diff --git a/charts/gis-platform/README.md b/charts/gis-platform/README.md index ef44f304d..b42f876ab 100644 --- a/charts/gis-platform/README.md +++ b/charts/gis-platform/README.md @@ -45,9 +45,9 @@ See the [documentation](https://docs.2gis.com/en/on-premise/gis-platform) to lea | Name | Description | Value | | ---------------------------- | ----------------------------------- | ------------------------------------- | | `spcore.image.repository` | SPCore service image repository. | `2gis-on-premise/gis_platform_spcore` | -| `spcore.image.tag` | SPCore service image tag. | `2022.9.29` | +| `spcore.image.tag` | SPCore service image tag. | `2023.3.29` | | `portal.image.repository` | Portal service image repository. | `2gis-on-premise/gis_platform_portal` | -| `portal.image.tag` | Portal service image tag. | `2022.9.29` | +| `portal.image.tag` | Portal service image tag. | `2023.3.29` | | `zookeeper.image.repository` | ZooKeeper service image repository. | `2gis-on-premise/zookeeper` | | `zookeeper.image.tag` | ZooKeeper service image tag. | `3.7.0-debian-10-r265` | @@ -144,9 +144,9 @@ See the [documentation](https://docs.2gis.com/en/on-premise/gis-platform) to lea | Name | Description | Value | | ------------------------------------- | ------------------------------------ | -------- | | `spcore.resources` | **Limits for the SPCore service** | | -| `spcore.resources.requests.cpu` | A CPU request. | `800m` | +| `spcore.resources.requests.cpu` | A CPU request. | `1` | | `spcore.resources.requests.memory` | A memory request. | `4096Mi` | -| `spcore.resources.limits.cpu` | A CPU limit. | `800m` | +| `spcore.resources.limits.cpu` | A CPU limit. | `2` | | `spcore.resources.limits.memory` | A memory limit. | `4096Mi` | | `portal.resources` | **Limits for the Portal service** | | | `portal.resources.requests.cpu` | A CPU request. | `100m` | diff --git a/charts/gis-platform/configs/spcore/SPCore.json.template b/charts/gis-platform/configs/spcore/SPCore.json.template index be6b4082f..3001c9814 100644 --- a/charts/gis-platform/configs/spcore/SPCore.json.template +++ b/charts/gis-platform/configs/spcore/SPCore.json.template @@ -5,6 +5,7 @@ "pluginsPath": "plugins", "silentlyApplyMigrations": true, "RequireUniqueEmail": true, + "AutoConfirmEmail": true, "maxRenderTargets": {{- .Values.spcore.maxRenderTargets }}, "staticPath": "/app/static", "previewStaticPath": "/app/static", diff --git a/charts/gis-platform/gis-platform-config/configuration/MapConfig.json b/charts/gis-platform/gis-platform-config/configuration/MapConfig.json index 55cbce84c..43c99f5da 100644 --- a/charts/gis-platform/gis-platform-config/configuration/MapConfig.json +++ b/charts/gis-platform/gis-platform-config/configuration/MapConfig.json @@ -50,15 +50,6 @@ }, "options": { "items": [ - { - "name": "print", - "route": { - "type": "PRINT" - }, - "title": "Экспортировать картинку", - "imageName": "print", - "description": "Сохраняет в виде картинки выделенную область карты и дополнительные элементы" - }, { "name": "buffer", "title": "Буферные зоны", @@ -179,6 +170,17 @@ "area": "panel" } }, + { + "name": "style-editor", + "route": "STYLE_EDITOR", + "preload": true, + "priority": 3, + "modulePath": "StyleEditor/StyleEditor", + "layoutOptions": { + "area": "panel", + "resizable": true + } + }, { "name": "project-panel", "route": "MAIN", @@ -190,11 +192,10 @@ }, { "name": "print", - "route": "PRINT", - "priority": 3, - "modulePath": "Print/Print", + "priority": 5, + "modulePath": "../../Print/Print", "layoutOptions": { - "area": "panel" + "area": "topControls" } }, { @@ -298,7 +299,382 @@ "feedbackForm": false, "uniqueClassesLimit": 300, "labelInsidePosition": true, - "scaleSegmentation": false, - "shareSocials": [] + "scaleSegmentation": true, + "shareSocials": [], + "showCOGProperty": false, + "allowedWMSLayers": 4, + "expressAnalytics": { + "uniqueValuesCount": 20 + }, + "defaultScaleRange": [ + 0, + 18 + ], + "importMaxFileSize": 52428800, + "uploadMaxFileSize": 52428800, + "dataFilterPlayButton": false, + "labelVisiblePosition": false, + "geoLocationResolution": 19.10925707128906, + "allowedAttributesIndexesCount": 2, + "colorScales": [ + { + "colorGroupName": "Последовательные", + "colorGroupScales": [ + { + "colorScaleName": "Желто-сереневая", + "colorScaleParams": [ + "rgba(255, 251, 200, 1)", + "rgba(255, 199, 79, 1)", + "rgba(255, 120, 41, 1)", + "rgba(219, 3, 157, 1)", + "rgba(10, 0, 180, 1)" + ] + }, + { + "colorScaleName": "Четвёртый", + "colorScaleParams": [ + "rgba(255, 255, 217, 1)", + "rgba(65, 182, 196, 1)", + "rgba(8, 29, 88, 1)" + ] + }, + { + "colorScaleName": "Пятый", + "colorScaleParams": [ + "rgba(255, 255, 204, 1)", + "rgba(253, 141, 60, 1)", + "rgba(128, 0, 38, 1)" + ] + }, + { + "colorScaleName": "Шестой", + "colorScaleParams": [ + "rgba(255, 247, 243, 1)", + "rgba(247, 104, 161, 1)", + "rgba(73, 0, 106, 1)" + ] + }, + { + "colorScaleName": "Сереневая", + "colorScaleParams": [ + "#FACCFFFF", + "#DCB0FFFF", + "#BE93FDFF", + "#A178DFFF", + "#845EC2FF" + ] + }, + { + "colorScaleName": "Красная", + "colorScaleParams": [ + "#750000ff", + "#7d1407ff", + "#84220dff", + "#8c2d13ff", + "#933819ff", + "#9b431fff", + "#a24d25ff", + "#aa572cff", + "#b16133ff", + "#b86b3bff", + "#bf7542ff", + "#c67f4aff", + "#ce8952ff", + "#d5935bff", + "#dc9d64ff", + "#e3a76dff", + "#eab176ff", + "#f1bb7fff", + "#f8c689ff", + "#ffd093ff" + ] + }, + { + "colorScaleName": "Красная", + "colorScaleParams": [ + "#5e3500", + "#663d06", + "#6d460d", + "#754e14", + "#7d571b", + "#846022", + "#8c6928", + "#93722f", + "#9b7b37", + "#a2853e", + "#a98e45", + "#b1984d", + "#b8a155", + "#bfab5d", + "#c6b565", + "#cdbf6e", + "#d4c976", + "#dbd37f", + "#e2de88", + "#e9e891" + ] + }, + { + "colorScaleName": "Красная", + "colorScaleParams": [ + "#418203", + "#4c8812", + "#568f1d", + "#609526", + "#699b2f", + "#73a238", + "#7ca840", + "#86ae48", + "#8fb551", + "#98bb59", + "#a2c262", + "#abc96a", + "#b4cf73", + "#bdd67b", + "#c6dd84", + "#cfe38d", + "#d8ea96", + "#e1f19f", + "#eaf8a8", + "#f3ffb1" + ] + }, + { + "colorScaleName": "Красная", + "colorScaleParams": [ + "#006e41", + "#157546", + "#237c4c", + "#2f8451", + "#3a8b56", + "#44935c", + "#4e9a62", + "#57a267", + "#61a96d", + "#6ab173", + "#74b879", + "#7dc07f", + "#87c885", + "#90d08b", + "#9ad791", + "#a4df97", + "#ade79e", + "#b7efa4", + "#c1f7aa", + "#cbffb1" + ] + }, + { + "colorScaleName": "Красная", + "colorScaleParams": [ + "#00518a", + "#005a92", + "#006399", + "#006da0", + "#0076a6", + "#007fac", + "#0089b1", + "#0092b7", + "#079bbb", + "#1ea5c0", + "#2faec4", + "#3eb7c8", + "#4cc0cb", + "#5ac9cf", + "#69d2d2", + "#77dbd6", + "#85e4d9", + "#94eddd", + "#a2f6e0", + "#b1ffe4" + ] + }, + { + "colorScaleName": "Красная", + "colorScaleParams": [ + "#06008a", + "#051493", + "#06229b", + "#092ea4", + "#0f3aab", + "#1645b3", + "#1e50ba", + "#275ac1", + "#3065c7", + "#3a6fcd", + "#447ad3", + "#4e85d9", + "#598fde", + "#649ae3", + "#70a4e8", + "#7caeed", + "#89b9f2", + "#96c3f6", + "#a3cefb", + "#b1d8ff" + ] + }, + { + "colorScaleName": "Красная", + "colorScaleParams": [ + "#420074", + "#47107c", + "#4c1d84", + "#51278b", + "#563193", + "#5b3a9b", + "#6044a2", + "#654daa", + "#6a56b1", + "#705fb9", + "#7668c0", + "#7c71c7", + "#827ace", + "#8883d6", + "#8e8cdd", + "#9595e4", + "#9b9eeb", + "#a2a8f1", + "#aab1f8", + "#b1baff" + ] + }, + { + "colorScaleName": "Красная", + "colorScaleParams": [ + "#74005a", + "#7a1162", + "#7f1e6b", + "#852873", + "#8a327c", + "#903b85", + "#95438d", + "#9b4c96", + "#a0549f", + "#a55da8", + "#aa65b0", + "#b06db9", + "#b576c2", + "#ba7ecb", + "#bf87d3", + "#c48fdc", + "#c997e5", + "#cfa0ee", + "#d4a8f6", + "#d9b1ff" + ] + } + ] + }, + { + "colorGroupName": "Расходящиеся", + "colorGroupScales": [ + { + "colorScaleName": "На вкус и цвет", + "colorScaleParams": [ + "#845EC2FF", + "#B93DAFFF", + "#D73222FF" + ] + }, + { + "colorScaleName": "Второй", + "colorScaleParams": [ + "rgba(0, 150, 64, 1)", + "rgba(166, 217, 106, 1)", + "rgba(255, 255, 191, 1)", + "rgba(253, 174, 97, 1)", + "rgba(213, 11, 0, 1)" + ] + }, + { + "colorScaleName": "Третий", + "colorScaleParams": [ + "rgba(33, 102, 172, 1)", + "rgba(146, 197, 222, 1)", + "rgba(247, 247, 247, 1)", + "rgba(244, 165, 130, 1)", + "rgba(178, 24, 43, 1)" + ] + }, + { + "colorScaleName": "Бледно-белый", + "colorScaleParams": [ + "#845EC2FF", + "#296073FF", + "#3596B5FF", + "#ADC5CFFF" + ] + }, + { + "colorScaleName": "Бледно-белый", + "colorScaleParams": [ + "#d16ba5ff", + "#c777b9ff", + "#ba83caff", + "#aa8fd8ff", + "#9a9ae1ff", + "#8aa7ecff", + "#79b3f4ff", + "#69bff8ff", + "#52cffeff", + "#41dfffff", + "#46eefaff", + "#5ffbf1ff" + ] + } + ] + }, + { + "colorGroupName": "Разные цвета", + "colorGroupScales": [ + { + "colorScaleName": "Седьмой", + "colorScaleParams": [ + "rgb(243, 156, 18)", + "rgb(46, 204, 113)", + "rgb(52, 152, 219)", + "rgb(142, 68, 173)", + "rgb(251, 154, 153)", + "rgb(227, 26, 28)", + "rgb(41, 128, 185)", + "rgb(255, 127, 0)", + "rgb(231, 76, 60)", + "rgb(155, 89, 182)", + "rgb(255, 255, 153)", + "rgb(192, 57, 43)" + ] + }, + { + "colorScaleName": "Седьмой", + "colorScaleParams": [ + "#334234", + "#231b13", + "#ba597c", + "#b70713", + "#f9e77f", + "#360eea", + "#07b0ff", + "#78b275", + "#442b75", + "#2d012c", + "#7f4f74", + "#ef4aa8", + "#877a7e", + "#c3d35b", + "#99acc6", + "#44257a", + "#537546", + "#d62c35", + "#332b0f", + "#2a252b" + ] + } + ] + } + ] + }, + "connection": { + "url": "/sp/" } } diff --git a/charts/gis-platform/gis-platform-config/layer/2gis.json b/charts/gis-platform/gis-platform-config/layer/2gis.json index cdbca645f..3ad68c462 100644 --- a/charts/gis-platform/gis-platform-config/layer/2gis.json +++ b/charts/gis-platform/gis-platform-config/layer/2gis.json @@ -97,7 +97,7 @@ ], "copyrightText": "", - "allowDirectAccess": true, + "allowDirectAccess": false, "tileCacheLimit": 0, "RequestTimeout": 0, "name": "admin.2gis", diff --git a/charts/gis-platform/gis-platform-config/layer/2gis_traffic.json b/charts/gis-platform/gis-platform-config/layer/2gis_traffic.json index b271ee08c..b04063690 100644 --- a/charts/gis-platform/gis-platform-config/layer/2gis_traffic.json +++ b/charts/gis-platform/gis-platform-config/layer/2gis_traffic.json @@ -1,18 +1,8 @@ { "urlFormat": "https://{0}.maps.2gis.com/dammam/traffic/{1}/{2}/{3}/speed/0/?1640062200", "subDomains": [ - "traffic0", - "traffic1", - "traffic2", - "traffic3", - "traffic4", - "traffic5", - "traffic6", - "traffic7", - "traffic8", - "traffic9" ], - "allowDirectAccess": true, + "allowDirectAccess": false, "tileCacheLimit": 0, "RequestTimeout": 0, "name": "admin.2gis_traffic", diff --git a/charts/gis-platform/gis-platform-config/layer/satellite_imagery.json b/charts/gis-platform/gis-platform-config/layer/satellite_imagery.json index 7a7da8575..365fdcacf 100644 --- a/charts/gis-platform/gis-platform-config/layer/satellite_imagery.json +++ b/charts/gis-platform/gis-platform-config/layer/satellite_imagery.json @@ -87,7 +87,6 @@ } ] }, - "allowDirectAccess": true, "tileCacheLimit": 0, "RequestTimeout": 0, "name": "admin.satellite_imagery", diff --git a/charts/gis-platform/values.yaml b/charts/gis-platform/values.yaml index 1cc99d103..d99c3b32c 100644 --- a/charts/gis-platform/values.yaml +++ b/charts/gis-platform/values.yaml @@ -70,14 +70,14 @@ spcore: image: repository: 2gis-on-premise/gis_platform_spcore - tag: 2022.9.29 + tag: 2023.3.29 resources: requests: - cpu: 800m + cpu: 1 memory: 4096Mi limits: - cpu: 800m + cpu: 2 memory: 4096Mi # @extra spcore.cors **CORS settings.** @@ -215,7 +215,7 @@ portal: image: repository: 2gis-on-premise/gis_platform_portal - tag: 2022.9.29 + tag: 2023.3.29 resources: requests: