public_git
/
postgres-operator
mirror of https://github.com/zalando/postgres-operator.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

reflect feedback

This commit is contained in:
Felix Kunde 2022-04-14 11:30:49 +02:00
parent 4b0602e911
commit 78a2e92626
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docs/administrator.md
View File

@ -623,8 +623,9 @@ individual backup locations for each of your clusters. Or you want to disable
WAL archiving for a certain cluster by setting `WAL_S3_BUCKET`, `WAL_GS_BUCKET` WAL archiving for a certain cluster by setting `WAL_S3_BUCKET`, `WAL_GS_BUCKET`
or `AZURE_STORAGE_ACCOUNT` to an empty string. or `AZURE_STORAGE_ACCOUNT` to an empty string.
The operator will give precendence to environment variables in the following The operator will give precedence to environment variables in the following
order: order (e.g. a variable defined in 4. overrides a variable with the same name
in 5.):
1. Assigned by the operator 1. Assigned by the operator
2. Clone section (with WAL settings from operator config when `s3_wal_path` is empty) 2. Clone section (with WAL settings from operator config when `s3_wal_path` is empty)

6
docs/user.md
View File

@ -786,7 +786,7 @@ metadata:
If your source cluster uses a WAL location different from the global If your source cluster uses a WAL location different from the global
configuration you can specify the full path under `s3_wal_path`. For configuration you can specify the full path under `s3_wal_path`. For
[Google Cloud Plattform](administrator.md#google-cloud-platform-setup) [Google Cloud Platform](administrator.md#google-cloud-platform-setup)
or [Azure](administrator.md#azure-setup) or [Azure](administrator.md#azure-setup)
it can only be set globally with [custom Pod environment variables](administrator.md#custom-pod-environment-variables) it can only be set globally with [custom Pod environment variables](administrator.md#custom-pod-environment-variables)
or locally in the Postgres manifest's [`env`](administrator.md#via-postgres-cluster-manifest) section. or locally in the Postgres manifest's [`env`](administrator.md#via-postgres-cluster-manifest) section.
@ -801,7 +801,7 @@ spec:
uid: "efd12e58-5786-11e8-b5a7-06148230260c" uid: "efd12e58-5786-11e8-b5a7-06148230260c"
cluster: "acid-minimal-cluster" cluster: "acid-minimal-cluster"
timestamp: "2017-12-19T12:40:33+01:00" timestamp: "2017-12-19T12:40:33+01:00"
s3_wal_path: "s3://<bucketname>/spilo/<source_db_cluster>/<UID>/wal/<PGVERSION>" s3_wal_path: "s3://custom/path/to/bucket"
s3_endpoint: https://s3.acme.org s3_endpoint: https://s3.acme.org
s3_access_key_id: 0123456789abcdef0123456789abcdef s3_access_key_id: 0123456789abcdef0123456789abcdef
s3_secret_access_key: 0123456789abcdef0123456789abcdef s3_secret_access_key: 0123456789abcdef0123456789abcdef
@ -892,7 +892,7 @@ spec:
gs_wal_path: "gs://<bucketname>/spilo/<source_db_cluster>/<UID>/wal/<PGVERSION>" gs_wal_path: "gs://<bucketname>/spilo/<source_db_cluster>/<UID>/wal/<PGVERSION>"
``` ```
For a remote primry you specify the host address and optionally the port. For a remote primary you specify the host address and optionally the port.
If you leave out the port Patroni will use `"5432"`. If you leave out the port Patroni will use `"5432"`.
```yaml ```yaml

6
pkg/cluster/k8sres.go
View File

@ -961,7 +961,7 @@ func (c *Cluster) getPodEnvironmentConfigMapVariables() ([]v1.EnvVar, error) {
configMapPodEnvVarsList := make([]v1.EnvVar, 0) configMapPodEnvVarsList := make([]v1.EnvVar, 0)
if c.OpConfig.PodEnvironmentConfigMap.Name == "" { if c.OpConfig.PodEnvironmentConfigMap.Name == "" {
return nil, nil return configMapPodEnvVarsList, nil
} }
cm, err := c.KubeClient.ConfigMaps(c.OpConfig.PodEnvironmentConfigMap.Namespace).Get( cm, err := c.KubeClient.ConfigMaps(c.OpConfig.PodEnvironmentConfigMap.Namespace).Get(
@ -993,7 +993,7 @@ func (c *Cluster) getPodEnvironmentSecretVariables() ([]v1.EnvVar, error) {
secretPodEnvVarsList := make([]v1.EnvVar, 0) secretPodEnvVarsList := make([]v1.EnvVar, 0)
if c.OpConfig.PodEnvironmentSecret == "" { if c.OpConfig.PodEnvironmentSecret == "" {
return nil, nil return secretPodEnvVarsList, nil
} }
secret := &v1.Secret{} secret := &v1.Secret{}
@ -1298,7 +1298,7 @@ func (c *Cluster) generateStatefulSet(spec *acidv1.PostgresSpec) (*appsv1.Statef
sidecarContainers, conflicts := mergeContainers(clusterSpecificSidecars, c.Config.OpConfig.SidecarContainers, globalSidecarContainersByDockerImage, scalyrSidecars) sidecarContainers, conflicts := mergeContainers(clusterSpecificSidecars, c.Config.OpConfig.SidecarContainers, globalSidecarContainersByDockerImage, scalyrSidecars)
for containerName := range conflicts { for containerName := range conflicts {
c.logger.Warningf("a sidecar is specified twice. Ignoring sidecar %q in favor of %q with high a precendence", c.logger.Warningf("a sidecar is specified twice. Ignoring sidecar %q in favor of %q with high a precedence",
containerName, containerName) containerName, containerName)
} }