update docs

This commit is contained in:
Rafia Sabih 2021-05-27 14:43:49 +02:00
parent 25a6417d47
commit 0f31b5bea6
6 changed files with 13 additions and 12 deletions

View File

@ -146,7 +146,7 @@ configKubernetes:
# Postgres pods are terminated forcefully after this timeout # Postgres pods are terminated forcefully after this timeout
pod_terminate_grace_period: 5m pod_terminate_grace_period: 5m
# template for database user secrets generated by the operator # template for database user secrets generated by the operator
secret_name_template: "{username}.{cluster}.credentials.{tprkind}.{tprgroup}" secret_name_template: "{namespace}.{username}.{cluster}.credentials.{tprkind}.{tprgroup}"
# set user and group for the spilo container (required to run Spilo as non-root process) # set user and group for the spilo container (required to run Spilo as non-root process)
# spilo_runasuser: "101" # spilo_runasuser: "101"
# spilo_runasgroup: "103" # spilo_runasgroup: "103"

View File

@ -138,7 +138,7 @@ configKubernetes:
# Postgres pods are terminated forcefully after this timeout # Postgres pods are terminated forcefully after this timeout
pod_terminate_grace_period: 5m pod_terminate_grace_period: 5m
# template for database user secrets generated by the operator # template for database user secrets generated by the operator
secret_name_template: "{username}.{cluster}.credentials.{tprkind}.{tprgroup}" secret_name_template: "{namespace}.{username}.{cluster}.credentials.{tprkind}.{tprgroup}"
# set user and group for the spilo container (required to run Spilo as non-root process) # set user and group for the spilo container (required to run Spilo as non-root process)
# spilo_runasuser: "101" # spilo_runasuser: "101"
# spilo_runasgroup: "103" # spilo_runasgroup: "103"

View File

@ -172,11 +172,11 @@ under the `users` key.
## Major version upgrades ## Major version upgrades
Parameters configuring automatic major version upgrades. In a Parameters configuring automatic major version upgrades. In a
CRD-configuration, they are grouped under the `major_version_upgrade` key. CRD-configuration, they are grouped under the `major_version_upgrade` key.
* **major_version_upgrade_mode** * **major_version_upgrade_mode**
Postgres Operator supports [in-place major version upgrade](../administrator.md#in-place-major-version-upgrade) Postgres Operator supports [in-place major version upgrade](../administrator.md#in-place-major-version-upgrade)
with three different modes: with three different modes:
`"off"` = no upgrade by the operator, `"off"` = no upgrade by the operator,
`"manual"` = manifest triggers action, `"manual"` = manifest triggers action,
@ -275,11 +275,12 @@ configuration they are grouped under the `kubernetes` key.
* **secret_name_template** * **secret_name_template**
a template for the name of the database user secrets generated by the a template for the name of the database user secrets generated by the
operator. `{username}` is replaced with name of the secret, `{cluster}` with operator. `{namesapce}` is replaced with name of the namespace (if any,
the name of the cluster, `{tprkind}` with the kind of CRD (formerly known as otherwise empty), `{username}` is replaced with name of the secret,
TPR) and `{tprgroup}` with the group of the CRD. No other placeholders are `{cluster}` with the name of the cluster, `{tprkind}` with the kind of CRD
allowed. The default is (formerly known as TPR) and `{tprgroup}` with the group of the CRD.
`{username}.{cluster}.credentials.{tprkind}.{tprgroup}`. No other placeholders are allowed. The default is
`{namesapce}.{username}.{cluster}.credentials.{tprkind}.{tprgroup}`.
* **cluster_domain** * **cluster_domain**
defines the default DNS domain for the kubernetes cluster the operator is defines the default DNS domain for the kubernetes cluster the operator is

View File

@ -113,7 +113,7 @@ data:
resync_period: 30m resync_period: 30m
ring_log_lines: "100" ring_log_lines: "100"
role_deletion_suffix: "_deleted" role_deletion_suffix: "_deleted"
secret_name_template: "{username}.{cluster}.credentials" secret_name_template: "{namespace}.{username}.{cluster}.credentials"
# sidecar_docker_images: "" # sidecar_docker_images: ""
# set_memory_request_to_limit: "false" # set_memory_request_to_limit: "false"
spilo_allow_privilege_escalation: "true" spilo_allow_privilege_escalation: "true"

View File

@ -78,7 +78,7 @@ configuration:
pod_service_account_name: postgres-pod pod_service_account_name: postgres-pod
# pod_service_account_role_binding_definition: "" # pod_service_account_role_binding_definition: ""
pod_terminate_grace_period: 5m pod_terminate_grace_period: 5m
secret_name_template: "{username}.{cluster}.credentials.{tprkind}.{tprgroup}" secret_name_template: "{namespace}.{username}.{cluster}.credentials.{tprkind}.{tprgroup}"
spilo_allow_privilege_escalation: true spilo_allow_privilege_escalation: true
# spilo_runasuser: 101 # spilo_runasuser: 101
# spilo_runasgroup: 103 # spilo_runasgroup: 103

View File

@ -41,7 +41,7 @@ import (
var ( var (
alphaNumericRegexp = regexp.MustCompile("^[a-zA-Z][a-zA-Z0-9]*$") alphaNumericRegexp = regexp.MustCompile("^[a-zA-Z][a-zA-Z0-9]*$")
databaseNameRegexp = regexp.MustCompile("^[a-zA-Z_][a-zA-Z0-9_]*$") databaseNameRegexp = regexp.MustCompile("^[a-zA-Z_][a-zA-Z0-9_]*$")
userRegexp = regexp.MustCompile(`^[a-z0-9,]+\.?[-_a-z0-9,]+[a-z0-9,]$`) userRegexp = regexp.MustCompile(`^[a-z0-9]+\.?[-_a-z0-9]+[a-z0-9]$`)
patroniObjectSuffixes = []string{"config", "failover", "sync"} patroniObjectSuffixes = []string{"config", "failover", "sync"}
) )