Skip to content

Commit

Permalink
Merge pull request #545 from 2gis/release-1.32.0-fix
Browse files Browse the repository at this point in the history 
release-1.32.0-fix
  • Loading branch information
@golovanovsv
golovanovsv authored Nov 28, 2024
2 parents 50fc0b0 + a6b41d9 commit c104679
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 30 deletions.
52 changes: 26 additions & 26 deletions charts/keys/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -205,32 +205,32 @@ See the [documentation](https://docs.2gis.com/en/on-premise/keys) to learn about

### Database access settings

| Name | Description | Value |
| ---------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------- |
| `postgres.ro` | **Settings for the read-only access** | |
| `postgres.ro.host` | PostgreSQL hostname or IP. **Required** | `""` |
| `postgres.ro.port` | PostgreSQL port. | `5432` |
| `postgres.ro.timeout` | PostgreSQL client connection timeout. | `3s` |
| `postgres.ro.name` | PostgreSQL database name. **Required** | `""` |
| `postgres.ro.schema` | PostgreSQL database schema. If not specified, schema from SEARCH_PATH will be used. | `""` |
| `postgres.ro.username` | PostgreSQL username. **Required** | `""` |
| `postgres.ro.password` | PostgreSQL password. **Required** | `""` |
| `postgres.ro.tls.mode` | PostgreSQL ssl [connection mode](https://www.postgresql.org/docs/current/libpq-ssl.html#LIBPQ-SSL-PROTECTION). Available modes: `disabled`, `require`, `verify-ca` and `verify-full`. | `disabled` |
| `postgres.ro.tls.serverCA` | PostgreSQL CA certificate for server CA verify. **Required for mode `verify-ca` or `verify-full`**. | `""` |
| `postgres.ro.tls.clientCert` | client certificate. **Required for mode `verify-full`**. | `""` |
| `postgres.ro.tls.clientKey` | client private key. **Required for mode `verify-full`**. | `""` |
| `postgres.rw` | **Settings for the read-write access** | |
| `postgres.rw.host` | PostgreSQL hostname or IP. **Required** | `""` |
| `postgres.rw.port` | PostgreSQL port. | `5432` |
| `postgres.rw.timeout` | PostgreSQL client connection timeout. | `3s` |
| `postgres.rw.name` | PostgreSQL database name. **Required** | `""` |
| `postgres.rw.schema` | PostgreSQL database schema. If not specified, schema from SEARCH_PATH will be used. | `""` |
| `postgres.rw.username` | PostgreSQL username. **Required** | `""` |
| `postgres.rw.password` | PostgreSQL password. **Required** | `""` |
| `postgres.rw.tls.mode` | PostgreSQL ssl [connection mode](https://www.postgresql.org/docs/current/libpq-ssl.html#LIBPQ-SSL-PROTECTION). Available modes: `disabled`, `require`, `verify-ca` and `verify-full`. | `disabled` |
| `postgres.rw.tls.serverCA` | PostgreSQL CA certificate for server CA verify. **Required for mode `verify-ca` or `verify-full`**. | `""` |
| `postgres.rw.tls.clientCert` | client certificate. **Required for mode `verify-full`**. | `""` |
| `postgres.rw.tls.clientKey` | client private key. **Required for mode `verify-full`**. | `""` |
| Name | Description | Value |
| ---------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | --------- |
| `postgres.ro` | **Settings for the read-only access** | |
| `postgres.ro.host` | PostgreSQL hostname or IP. **Required** | `""` |
| `postgres.ro.port` | PostgreSQL port. | `5432` |
| `postgres.ro.timeout` | PostgreSQL client connection timeout. | `3s` |
| `postgres.ro.name` | PostgreSQL database name. **Required** | `""` |
| `postgres.ro.schema` | PostgreSQL database schema. If not specified, schema from SEARCH_PATH will be used. | `""` |
| `postgres.ro.username` | PostgreSQL username. **Required** | `""` |
| `postgres.ro.password` | PostgreSQL password. **Required** | `""` |
| `postgres.ro.tls.mode` | PostgreSQL ssl [connection mode](https://www.postgresql.org/docs/current/libpq-ssl.html#LIBPQ-SSL-PROTECTION). Available modes: `disable`, `require`, `verify-ca` and `verify-full`. | `disable` |
| `postgres.ro.tls.serverCA` | PostgreSQL CA certificate for server CA verify. **Required for mode `verify-ca` or `verify-full`**. | `""` |
| `postgres.ro.tls.clientCert` | client certificate. **Required for mode `verify-full`**. | `""` |
| `postgres.ro.tls.clientKey` | client private key. **Required for mode `verify-full`**. | `""` |
| `postgres.rw` | **Settings for the read-write access** | |
| `postgres.rw.host` | PostgreSQL hostname or IP. **Required** | `""` |
| `postgres.rw.port` | PostgreSQL port. | `5432` |
| `postgres.rw.timeout` | PostgreSQL client connection timeout. | `3s` |
| `postgres.rw.name` | PostgreSQL database name. **Required** | `""` |
| `postgres.rw.schema` | PostgreSQL database schema. If not specified, schema from SEARCH_PATH will be used. | `""` |
| `postgres.rw.username` | PostgreSQL username. **Required** | `""` |
| `postgres.rw.password` | PostgreSQL password. **Required** | `""` |
| `postgres.rw.tls.mode` | PostgreSQL ssl [connection mode](https://www.postgresql.org/docs/current/libpq-ssl.html#LIBPQ-SSL-PROTECTION). Available modes: `disable`, `require`, `verify-ca` and `verify-full`. | `disable` |
| `postgres.rw.tls.serverCA` | PostgreSQL CA certificate for server CA verify. **Required for mode `verify-ca` or `verify-full`**. | `""` |
| `postgres.rw.tls.clientCert` | client certificate. **Required for mode `verify-full`**. | `""` |
| `postgres.rw.tls.clientKey` | client private key. **Required for mode `verify-full`**. | `""` |

### Kafka settings

Expand Down
8 changes: 4 additions & 4 deletions charts/keys/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,7 @@ postgres:
# @param postgres.ro.schema PostgreSQL database schema. If not specified, schema from SEARCH_PATH will be used.
# @param postgres.ro.username PostgreSQL username. **Required**
# @param postgres.ro.password PostgreSQL password. **Required**
# @param postgres.ro.tls.mode PostgreSQL ssl [connection mode](https://www.postgresql.org/docs/current/libpq-ssl.html#LIBPQ-SSL-PROTECTION). Available modes: `disabled`, `require`, `verify-ca` and `verify-full`.
# @param postgres.ro.tls.mode PostgreSQL ssl [connection mode](https://www.postgresql.org/docs/current/libpq-ssl.html#LIBPQ-SSL-PROTECTION). Available modes: `disable`, `require`, `verify-ca` and `verify-full`.
# @param postgres.ro.tls.serverCA PostgreSQL CA certificate for server CA verify. **Required for mode `verify-ca` or `verify-full`**.
# @param postgres.ro.tls.clientCert client certificate. **Required for mode `verify-full`**.
# @param postgres.ro.tls.clientKey client private key. **Required for mode `verify-full`**.
Expand All @@ -518,7 +518,7 @@ postgres:
username: ''
password: ''
tls:
mode: disabled
mode: disable
serverCA: ''
clientCert: ''
clientKey: ''
Expand All @@ -532,7 +532,7 @@ postgres:
# @param postgres.rw.schema PostgreSQL database schema. If not specified, schema from SEARCH_PATH will be used.
# @param postgres.rw.username PostgreSQL username. **Required**
# @param postgres.rw.password PostgreSQL password. **Required**
# @param postgres.rw.tls.mode PostgreSQL ssl [connection mode](https://www.postgresql.org/docs/current/libpq-ssl.html#LIBPQ-SSL-PROTECTION). Available modes: `disabled`, `require`, `verify-ca` and `verify-full`.
# @param postgres.rw.tls.mode PostgreSQL ssl [connection mode](https://www.postgresql.org/docs/current/libpq-ssl.html#LIBPQ-SSL-PROTECTION). Available modes: `disable`, `require`, `verify-ca` and `verify-full`.
# @param postgres.rw.tls.serverCA PostgreSQL CA certificate for server CA verify. **Required for mode `verify-ca` or `verify-full`**.
# @param postgres.rw.tls.clientCert client certificate. **Required for mode `verify-full`**.
# @param postgres.rw.tls.clientKey client private key. **Required for mode `verify-full`**.
Expand All @@ -546,7 +546,7 @@ postgres:
username: ''
password: ''
tls:
mode: disabled
mode: disable
serverCA: ''
clientCert: ''
clientKey: ''
Expand Down

0 comments on commit c104679

Please sign in to comment.