From 7160161cacbc511d1659f5ff0fc2afba0cc31e31 Mon Sep 17 00:00:00 2001 From: Voronkov Alexander Date: Thu, 17 Oct 2024 14:46:41 +0300 Subject: [PATCH] =?UTF-8?q?[EVERGIS]=20websocket-services=20=D0=B4=D0=BE?= =?UTF-8?q?=D0=BB=D0=B6=D0=B5=D0=BD=20=D1=83=D0=BA=D0=B0=D0=B7=D1=8B=D0=B2?= =?UTF-8?q?=D0=B0=D1=82=D1=8C=20=D0=BD=D0=B0=20backend.service.name.=20Req?= =?UTF-8?q?uired=20defaults=20(#457)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [EVERGIS] websocket-services должен указывать на backend.service.name * [EVERGIS] websocket-services должен указывать на backend.service.name. Default values * [EVERGIS] websocket-services должен указывать на backend.service.name. Default values --------- Co-authored-by: Alexander Voronkov --- charts/gis-platform/README.md | 8 ++++---- .../templates/gis-platform-websocket-ingress.yaml | 2 +- charts/gis-platform/values.yaml | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/charts/gis-platform/README.md b/charts/gis-platform/README.md index 297054be8..feb10c9d3 100644 --- a/charts/gis-platform/README.md +++ b/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** | `admin@example.com` | -| `spcore.admin.password` | Admin password **Required** | `123456` | +| `spcore.admin.email` | Admin email **Required** Example: admin@example.com | `""` | +| `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** | `""` | diff --git a/charts/gis-platform/templates/gis-platform-websocket-ingress.yaml b/charts/gis-platform/templates/gis-platform-websocket-ingress.yaml index a14fa1104..0b56eaba8 100644 --- a/charts/gis-platform/templates/gis-platform-websocket-ingress.yaml +++ b/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 }} diff --git a/charts/gis-platform/values.yaml b/charts/gis-platform/values.yaml index 3db9f23f3..bde507027 100644 --- a/charts/gis-platform/values.yaml +++ b/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: admin@example.com # @param spcore.admin.password Admin password **Required** admin: - email: admin@example.com - 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`