Revert "Merge master"

This reverts commit 65603e1, reversing changes made to 4ce4a76.
2gis · Nov 7, 2024 · 64c01cc · 64c01cc
1 parent 65603e1
commit 64c01cc
Show file tree

Hide file tree

Showing 36 changed files with 93 additions and 60 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,25 +1,5 @@
 # 2GIS On-Premise Changelog
 
-## [1.31.0] (2024-11-07)
-#### Images
-```
-floors-api
-	- floors-importer:1.0.4
-	+ floors-importer:1.1.0
-	- floors-nodejs:1.0.4
-	+ floors-nodejs:1.1.0
-mapgl-js-api
-	- mapgl:1.51.0
-	+ mapgl:1.53.0
-navi-back
-	- navi-back:7.27.1.2
-	+ navi-back:7.29.2.2
-search-api
-	- search-api:7.80.0
-	+ search-api:7.85.0
-
-```
-
 ## [1.30.0] (2024-10-24)
 #### [Breaking-Changes](Breaking-Changes.md#1300)
 #### Images

diff --git a/charts/catalog-api/Chart.yaml b/charts/catalog-api/Chart.yaml
@@ -3,7 +3,7 @@ name: catalog-api
 type: application
 description: A Helm chart for Kubernetes to deploy Catalog APIs
 
-version: 1.31.0
+version: 1.30.0
 appVersion: 3.625.0
 
 maintainers:

diff --git a/charts/citylens/Chart.yaml b/charts/citylens/Chart.yaml
@@ -3,7 +3,7 @@ name: citylens
 type: application
 description: A Helm chart for Kubernetes to deploy Citylens service
 
-version: 1.31.0
+version: 1.30.0
 appVersion: 1.14.2
 
 maintainers:

diff --git a/charts/dgtt/Chart.yaml b/charts/dgtt/Chart.yaml
@@ -3,7 +3,7 @@ name: dgtt
 description: DGTT Helm chart for Kubernetes
 type: application
 
-version: 1.31.0
+version: 1.30.0
 appVersion: 0.2.27-b188673e09
 
 maintainers:

diff --git a/charts/floors-api/Chart.yaml b/charts/floors-api/Chart.yaml
@@ -3,7 +3,7 @@ name: floors-api
 description: Helm for floors service
 type: application
 
-version: 1.31.0
+version: 1.30.0
 appVersion: 1.1.0
 
 maintainers:

diff --git a/charts/floors-api/README.md b/charts/floors-api/README.md
@@ -18,7 +18,7 @@ Read more about the On-Premise solution [here](https://docs.2gis.com/en/on-premi
 | ------------------------- | -------------------------------- | ------------------------------- |
 | `nodejs.image.repository` | Floors backend image repository. | `2gis-on-premise/floors-nodejs` |
 | `nodejs.image.pullPolicy` | Floors backend pull policy.      | `IfNotPresent`                  |
-| `nodejs.image.tag`        | Floors backend image tag.        | `1.1.0`                         |
+| `nodejs.image.tag`        | Floors backend image tag.        | `1.0.4`                         |
 | `nginx.image.repository`  | Floors nginx image repository.   | `2gis-on-premise/nginx`         |
 | `nginx.image.pullPolicy`  | Floors nginx pull policy.        | `IfNotPresent`                  |
 | `nginx.image.tag`         | Floors nginx image tag.          | `1.21.6`                        |
@@ -102,7 +102,7 @@ Read more about the On-Premise solution [here](https://docs.2gis.com/en/on-premi
 | Name                               | Description                      | Value                             |
 | ---------------------------------- | -------------------------------- | --------------------------------- |
 | `import.image.repository`          | Import task image repository.    | `2gis-on-premise/floors-importer` |
-| `import.image.tag`                 | Import task image tag.           | `1.1.0`                           |
+| `import.image.tag`                 | Import task image tag.           | `1.0.4`                           |
 | `import.image.pullPolicy`          | Import task pull policy.         | `IfNotPresent`                    |
 | `import.resources.requests.cpu`    | A CPU request, e.g., `100m`.     |                                   |
 | `import.resources.requests.memory` | A memory request, e.g., `128Mi`. |                                   |

diff --git a/charts/floors-api/values.yaml b/charts/floors-api/values.yaml
@@ -129,7 +129,7 @@ nodejs:
   image:
     repository: 2gis-on-premise/floors-nodejs
     pullPolicy: IfNotPresent
-    tag: 1.1.0
+    tag: 1.0.4
 
 
 # @section Floors nginx settings
@@ -166,3 +166,16 @@ import:
     repository: 2gis-on-premise/floors-importer
     pullPolicy: IfNotPresent
     tag: 1.0.4
+
+# @section **Custom Certificate Authority**
+
+# @param customCAs.bundle Custom CA [text representation of the X.509 PEM public-key certificate](https://www.rfc-editor.org/rfc/rfc7468#section-5.1)
+# @param customCAs.certsPath Custom CA bundle mount directory in the container.
+
+customCAs:
+  bundle: ''
+  # bundle: |
+  #   -----BEGIN CERTIFICATE-----
+  #   ...
+  #   -----END CERTIFICATE-----
+  certsPath: ''
diff --git a/charts/generic-chart/Chart.yaml b/charts/generic-chart/Chart.yaml
@@ -4,7 +4,7 @@ description: Generic library Helm chart for 2Gis
 type: library
 keywords:
 - library
-version: 1.31.0
+version: 1.30.0
 maintainers:
 - name: 2gis
   url: https://github.com/2gis

diff --git a/charts/gis-platform/Chart.yaml b/charts/gis-platform/Chart.yaml
@@ -4,7 +4,7 @@ description: GIS Platform
 
 type: application
 
-version: 1.31.0
+version: 1.30.0
 appVersion: 2023.8.3-0
 
 dependencies:

diff --git a/charts/keycloak/Chart.yaml b/charts/keycloak/Chart.yaml
@@ -3,7 +3,7 @@ name: keycloak
 type: application
 description: Keycloak is a high performance Java-based identity and access management solution. It lets developers add an authentication layer to their applications with minimum effort.
 
-version: 1.31.0
+version: 1.30.0
 appVersion: 21.1.1-debian-11-r4
 
 maintainers:

diff --git a/charts/keys/Chart.yaml b/charts/keys/Chart.yaml
@@ -3,7 +3,7 @@ name: keys
 type: application
 description: A Helm chart for Kubernetes to deploy API Keys service
 
-version: 1.31.0
+version: 1.30.0
 appVersion: 1.89.0
 
 maintainers:

diff --git a/charts/license/Chart.yaml b/charts/license/Chart.yaml
@@ -3,7 +3,7 @@ name: license
 type: application
 description: A Helm chart for Kubernetes to deploy License service
 
-version: 1.31.0
+version: 1.30.0
 appVersion: 2.2.3
 
 maintainers:

diff --git a/charts/mapgl-js-api/Chart.yaml b/charts/mapgl-js-api/Chart.yaml
@@ -4,7 +4,7 @@ description: Basic WebGL map chart template for 2GIS On-Premise
 
 type: application
 
-version: 1.31.0
+version: 1.30.0
 appVersion: 1.53.0
 
 maintainers:

diff --git a/charts/mapgl-js-api/README.md b/charts/mapgl-js-api/README.md
@@ -46,7 +46,7 @@ See the [documentation](https://docs.2gis.com/en/on-premise/map) to learn about:
 | Name               | Description | Value                   |
 | ------------------ | ----------- | ----------------------- |
 | `image.repository` | Repository  | `2gis-on-premise/mapgl` |
-| `image.tag`        | Tag         | `1.53.0`                |
+| `image.tag`        | Tag         | `1.51.0`                |
 | `image.pullPolicy` | Pull Policy | `IfNotPresent`          |
 
 ### Environment variables

diff --git a/charts/mapgl-js-api/values.yaml b/charts/mapgl-js-api/values.yaml
@@ -38,7 +38,7 @@ podLabels: {}
 
 image:
   repository: 2gis-on-premise/mapgl
-  tag: 1.53.0
+  tag: 1.51.0
   pullPolicy: IfNotPresent
 
 

diff --git a/charts/navi-async-grpc-proxy/Chart.yaml b/charts/navi-async-grpc-proxy/Chart.yaml
@@ -6,7 +6,7 @@ keywords:
 - navi
 - dm-async-matrix
 - async-grpc-proxy
-version: 1.31.0
+version: 1.30.0
 appVersion: 0.0.2
 maintainers:
 - name: 2gis

diff --git a/charts/navi-async-matrix/Chart.yaml b/charts/navi-async-matrix/Chart.yaml
@@ -4,7 +4,7 @@ description: Service implements asynchronous API over Distance Matrix
 
 type: application
 
-version: 1.31.0
+version: 1.30.0
 appVersion: 1.11.2
 
 maintainers:

diff --git a/charts/navi-back/Chart.yaml b/charts/navi-back/Chart.yaml
@@ -6,7 +6,7 @@ keywords:
 - navi
 - back
 - backend
-version: 1.31.0
+version: 1.30.0
 appVersion: 7.29.2.2
 dependencies:
 - name: generic-chart

diff --git a/charts/navi-castle/Chart.yaml b/charts/navi-castle/Chart.yaml
@@ -4,7 +4,7 @@ description: Castle Helm chart for Kubernetes
 type: application
 
 
-version: 1.31.0
+version: 1.30.0
 appVersion: 1.9.2
 
 maintainers:

diff --git a/charts/navi-front/Chart.yaml b/charts/navi-front/Chart.yaml
@@ -5,7 +5,7 @@ type: application
 keywords:
 - navi
 - front
-version: 1.31.0
+version: 1.30.0
 appVersion: 1.24.1
 maintainers:
 - name: 2gis

diff --git a/charts/navi-restrictions/Chart.yaml b/charts/navi-restrictions/Chart.yaml
@@ -4,7 +4,7 @@ description: A Helm chart for Kubernetes to deploy Restrictions backend
 
 type: application
 
-version: 1.31.0
+version: 1.30.0
 appVersion: 1.24.1
 
 maintainers:

diff --git a/charts/navi-router/Chart.yaml b/charts/navi-router/Chart.yaml
@@ -5,7 +5,7 @@ type: application
 keywords:
 - navi
 - router
-version: 1.31.0
+version: 1.30.0
 appVersion: 6.24.0.3
 maintainers:
 - name: 2gis

diff --git a/charts/navi-splitter/Chart.yaml b/charts/navi-splitter/Chart.yaml
@@ -15,5 +15,5 @@ maintainers:
 - name: 2gis
   url: https://github.com/2gis
   email: on-premise@2gis.com
-version: 1.31.0
+version: 1.30.0
 appVersion: 1.0.1
diff --git a/charts/platform/Chart.yaml b/charts/platform/Chart.yaml
@@ -3,7 +3,7 @@ name: platform
 type: application
 description: A Helm chart for Kubernetes to deploy Platform
 
-version: 1.31.0
+version: 1.30.0
 appVersion: 0.15.1
 
 maintainers:

diff --git a/charts/pro-api/Chart.yaml b/charts/pro-api/Chart.yaml
@@ -4,7 +4,7 @@ description: Geo API for getting geo data
 
 type: application
 
-version: 1.31.0
+version: 1.30.0
 appVersion: 1.41.0
 
 maintainers:

diff --git a/charts/pro-ui/Chart.yaml b/charts/pro-ui/Chart.yaml
@@ -3,7 +3,7 @@ name: pro-ui
 type: application
 description: A Helm chart for Kubernetes to deploy 2GIS Pro UI service
 
-version: 1.31.0
+version: 1.30.0
 appVersion: 2.27.0
 
 maintainers:

diff --git a/charts/search-api/Chart.yaml b/charts/search-api/Chart.yaml
@@ -4,8 +4,8 @@ description: Search engine for catalog
 
 type: application
 
-version: 1.31.0
-appVersion: 7.85.0
+version: 1.30.0
+appVersion: 7.80.0
 
 maintainers:
 - name: 2gis

diff --git a/charts/search-api/README.md b/charts/search-api/README.md
@@ -56,7 +56,7 @@ See the [documentation](https://docs.2gis.com/en/on-premise/search) to learn abo
 | Name                   | Description                                                                                   | Value                        |
 | ---------------------- | --------------------------------------------------------------------------------------------- | ---------------------------- |
 | `api.image.repository` | Repository                                                                                    | `2gis-on-premise/search-api` |
-| `api.image.tag`        | Tag                                                                                           | `7.85.0`                     |
+| `api.image.tag`        | Tag                                                                                           | `7.80.0`                     |
 | `api.image.pullPolicy` | Image [pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) | `IfNotPresent`               |
 
 ### API settings

diff --git a/charts/search-api/values.yaml b/charts/search-api/values.yaml
@@ -56,7 +56,7 @@ api:
 
   image:
     repository: 2gis-on-premise/search-api
-    tag: 7.85.0
+    tag: 7.80.0
     pullPolicy: IfNotPresent
 
 

diff --git a/charts/stat-receiver/Chart.yaml b/charts/stat-receiver/Chart.yaml
@@ -3,7 +3,7 @@ name: stat-receiver
 type: application
 description: A Helm chart for Kubernetes to deploy Stat Receiver
 
-version: 1.31.0
+version: 1.30.0
 appVersion: 1.11.1
 
 maintainers:

diff --git a/charts/styles-api/Chart.yaml b/charts/styles-api/Chart.yaml
@@ -3,7 +3,7 @@ name: styles-api
 type: application
 description: A Helm chart for Kubernetes to deploy API Styles service
 
-version: 1.31.0
+version: 1.30.0
 appVersion: 0.30.0
 
 maintainers:

diff --git a/charts/tiles-api/Chart.yaml b/charts/tiles-api/Chart.yaml
@@ -4,7 +4,7 @@ description: Tiles API for getting cartographic data
 
 type: application
 
-version: 1.31.0
+version: 1.30.0
 appVersion: 4.61.0
 
 maintainers:

diff --git a/charts/traffic-proxy/Chart.yaml b/charts/traffic-proxy/Chart.yaml
@@ -4,7 +4,7 @@ description: A Helm chart for Kubernetes to deploy Proxy for traffic jams
 
 type: application
 
-version: 1.31.0
+version: 1.30.0
 appVersion: 1.21.6
 
 maintainers:

diff --git a/charts/traffic-proxy/values.yaml b/charts/traffic-proxy/values.yaml
@@ -55,6 +55,46 @@ proxy:
     enabled: true
     age: 1m
     size: 32m
+  worker:
+    processes: 2
+    connections: 1024
+  log:
+    # @param proxy.log.customFormats List of custom log formats to be used in NGINX configuration
+    customFormats: []
+    # - name: small
+    #   escape: json
+    #   format: |
+    #     '{"time_local":"$time_local",'
+    #     '"remote_addr":"$remote_addr",'
+    #     '"request":"$request",'
+    #     '"status":"$status",'
+    #     '"host":"$host"}'
+    errorLog:
+      level: error
+
+    accessLog: 'off'
+    # accessLog: '/dev/stdout main'
+
+  keepaliveTimeout: 65
+
+  # @param proxy.locations List of additional location blocks to be included in the NGINX configuration
+  locations: []
+  # - path: /test/
+  #   definition: |
+  #     default_type text/html;
+  #     return 200 "<!DOCTYPE html><h2>test page</h2>\n";
+
+  # @param proxy.httpServers List of additional server blocks to be included in the NGINX configuration
+  httpServers: {}
+      # examplecfg: |
+      # server {
+      #   listen 0.0.0.0:8080;
+
+      #   location / {
+      #       default_type text/html;
+      #       return 200 "<!DOCTYPE html><h2>test page</h2>\n";
+      #   }
+      # }
 
 
 # @section Deployment settings

diff --git a/charts/twins-api/Chart.yaml b/charts/twins-api/Chart.yaml
@@ -3,7 +3,7 @@ name: twins-api
 type: application
 description: A Helm chart for Kubernetes to deploy API Twins service
 
-version: 1.31.0
+version: 1.30.0
 appVersion: 1.13.0
 
 maintainers: