tiles-api: rename bss & description edits

.github/workflows/mm-notify.yaml → .github/workflows/mm-pr-notify.yaml

@@ -4,7 +4,12 @@ name: Send notification to Mattermost
 
 on:
   pull_request:
-    types: [opened, reopened, edited, ready_for_review]
+    types:
+      - opened
+      - reopened
+      - edited
+      - ready_for_review
+
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -21,7 +26,7 @@ jobs:
       - uses: mattermost/action-mattermost-notify@master
         if: ${{ (github.event.pull_request.draft == false && startsWith(github.event.pull_request.title, 'WIP:') == false && github.event.action == 'edited'  &&  startsWith(github.event.changes.title.from, 'WIP:') == true ) ||  github.event.action == 'ready_for_review'}}
         with:
-          MATTERMOST_WEBHOOK_URL: ${{ secrets.MM_WEBHOOK_URL }}
+          MATTERMOST_WEBHOOK_URL: ${{ secrets.MM_WH_PR }}
           MATTERMOST_USERNAME: Github
           MATTERMOST_ICON_URL: https://upload.wikimedia.org/wikipedia/commons/thumb/c/c2/GitHub_Invertocat_Logo.svg/256px-GitHub_Invertocat_Logo.svg.png
           TEXT: |

.github/workflows/mm-release-notify.yaml

@@ -0,0 +1,27 @@
+---
+
+name: Send release notification to Mattermost
+
+on:
+  workflow_run:
+    workflows:
+      - "Release Charts"
+    push:
+      tags:
+        - \d+\.\d+\.\d+
+    types:
+      - completed
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: mattermost/action-mattermost-notify@master
+        if: ${{ github.event.workflow_run.conclusion == 'success' }}
+        with:
+          MATTERMOST_WEBHOOK_URL: ${{ secrets.MM_WH_ON_PREMISE_RELEASE }}
+          MATTERMOST_USERNAME: Github
+          MATTERMOST_ICON_URL: https://upload.wikimedia.org/wikipedia/commons/thumb/c/c2/GitHub_Invertocat_Logo.svg/256px-GitHub_Invertocat_Logo.svg.png
+          TEXT: |
+            Опубликован On-Premise: ${{ github.ref_name }} 
+            Документация: https://confluence.2gis.ru/display/Karta/Release+${{ github.ref_name }}+On-Premise

charts/gis-platform/README.md

@@ -84,11 +84,11 @@ See the [documentation](https://docs.2gis.com/en/on-premise/gis-platform) to lea
 | `spcore.postgres.name`                      | PostgreSQL database name **Required**                                                               | `""`                |
 | `spcore.postgres.poolsize`                  | PostgreSQL connection pool size.                                                                    | `25`                |
 | `spcore.admin`                              | **Admin access settings.**                                                                          |                     |
-| `spcore.admin.email`                        | Admin email **Required**                                                                            | `[email protected]` |
-| `spcore.admin.password`                     | Admin password **Required**                                                                         | `123456`            |
+| `spcore.admin.email`                        | Admin email **Required** Example: [email protected]                                                 | `""`                |
+| `spcore.admin.password`                     | Admin password **Required**                                                                         | `""`                |
 | `spcore.jwt`                                | **JSON Web Token (JWT) settings.**                                                                  |                     |
-| `spcore.jwt.tokenKey`                       | JWT default user token **Required**                                                                 | `supersecrettoken`  |
-| `spcore.jwt.tokenAdmin`                     | JWT admin user token **Required**                                                                   | `supersecrettoken`  |
+| `spcore.jwt.tokenKey`                       | JWT default user token **Required**                                                                 | `""`                |
+| `spcore.jwt.tokenAdmin`                     | JWT admin user token **Required**                                                                   | `""`                |
 | `spcore.catalog`                            | **Catalog settings.**                                                                               |                     |
 | `spcore.catalog.url`                        | Catalog service URL **Required** Example: `http://catalog-api`                                      | `""`                |
 | `spcore.catalog.key`                        | Catalog access key **Required**                                                                     | `""`                |

charts/gis-platform/templates/gis-platform-portal-configmap.yaml

@@ -9,5 +9,5 @@ metadata:
 data:
   nginx.conf: |-
     {{- tpl (.Files.Get "configs/portal/nginx.conf.template") . | nindent 4 }}
-  default.conf.template: |-
+  default.conf: |-
     {{- tpl (.Files.Get "configs/portal/default.conf.template") . | nindent 4 }}

charts/gis-platform/templates/gis-platform-portal-dep.yaml

@@ -40,8 +40,8 @@ spec:
             {{- toYaml .Values.portal.resources | nindent 12 }}
           volumeMounts:
             - name: {{ include "gis-platform-portal.name" . }}-configmap
-              mountPath: /etc/nginx/templates/default.conf.template
-              subPath: default.conf.template
+              mountPath: /etc/nginx/conf.d/default.conf
+              subPath: default.conf
             - name: {{ include "gis-platform-portal.name" . }}-configmap
               mountPath: /etc/nginx/nginx.conf
               subPath: nginx.conf

charts/gis-platform/templates/gis-platform-websocket-ingress.yaml

@@ -11,7 +11,7 @@ metadata:
     nginx.ingress.kubernetes.io/proxy-connect-timeout: {{ .Values.portal.websocket.timeout | quote }}
     nginx.ingress.kubernetes.io/proxy-read-timeout: {{ .Values.portal.websocket.timeout | quote }}
     nginx.ingress.kubernetes.io/proxy-send-timeout: {{ .Values.portal.websocket.timeout | quote }}
-    nginx.org/websocket-services: websocket
+    nginx.org/websocket-services: {{ $fullName }}
   {{- if .Values.ingress.annotations }}
     {{- with .Values.ingress.annotations }}
     {{- toYaml . | nindent 4 }}

charts/gis-platform/values.yaml

@@ -126,20 +126,20 @@ spcore:
     poolsize: 25
 
   # @extra spcore.admin **Admin access settings.**
-  # @param spcore.admin.email Admin email **Required**
+  # @param spcore.admin.email Admin email **Required** Example: [email protected]
   # @param spcore.admin.password Admin password **Required**
 
   admin:
-    email: [email protected]
-    password: '123456'
+    email: ''
+    password: ''
 
   # @extra spcore.jwt **JSON Web Token (JWT) settings.**
   # @param spcore.jwt.tokenKey JWT default user token **Required**
   # @param spcore.jwt.tokenAdmin JWT admin user token **Required**
 
   jwt:
-    tokenKey: supersecrettoken
-    tokenAdmin: supersecrettoken
+    tokenKey: ''
+    tokenAdmin: ''
 
   # @extra spcore.catalog **Catalog settings.**
   # @param spcore.catalog.url Catalog service URL **Required** Example: `http://catalog-api`

charts/tiles-api/Chart.yaml

@@ -5,7 +5,7 @@ description: Tiles API for getting cartographic data
 type: application
 
 version: 1.29.0
-appVersion: 4.54.0
+appVersion: 4.61.0
 
 maintainers:
 - name: 2gis