[EVERGIS] websocket-services должен указывать на backend.service.name…

…. Required defaults (#457) * [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 <[email protected]>
2gis · Oct 17, 2024 · 7160161 · 7160161
1 parent 546f700
commit 7160161
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git 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**                                                                            | `[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**                                                                     | `""`                |

diff --git 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
@@ -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`