Skip to content

Commit 4862e17

Browse files
committed
use capital letter for names + fix typos
1 parent 0604b5d commit 4862e17

File tree

7 files changed

+62
-59
lines changed

7 files changed

+62
-59
lines changed

CONTRIBUTING.md

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,19 @@ Wanna contribute to the Postgres Operator? Yay - here is how!
44

55
## Reporting issues
66

7-
If you have a question about patroni or have a problem using it, please read the`README` before filing an issue.
8-
Also double check with the current issues on our [Issues Tracker](https://github.com/zalando/postgres-operator/issues).
7+
Before filing an issue, if you have a question about Postgres Operator or have
8+
a problem using it, please read the [concepts](docs/index.md) page or use the
9+
different guides that we provide for [users](docs/user.md),
10+
[developers](docs/developer.md) or [admins](docs/administrator). Also double
11+
check with the current issues on our [Issues Tracker](https://github.com/zalando/postgres-operator/issues).
912

1013
## Contributing a pull request
1114

12-
1. Submit a comment to the relevant issue or create a new issue describing your proposed change.
13-
1. Do a fork, develop and test your code changes.
14-
1. Include documentation
15-
1. Submit a pull request.
15+
1. Submit a comment to the relevant issue or create a new issue describing your
16+
proposed change.
17+
2. Do a fork, develop and test your code changes.
18+
3. Include documentation
19+
4. Submit a pull request.
1620

1721
You'll get feedback about your pull request as soon as possible.
1822

docs/developer.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ localhost:8080 by doing:
128128

129129
$ kubectl --context minikube port-forward $(kubectl --context minikube get pod -l name=postgres-operator -o jsonpath={.items..metadata.name}) 8080:8080
130130

131-
The inner 'query' gets the name of the postgres operator pod, and the outer
131+
The inner 'query' gets the name of the Postgres Operator pod, and the outer
132132
enables port forwarding. Afterwards, you can access the operator API with:
133133

134134
```

docs/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ manages PostgreSQL clusters on Kubernetes (K8s):
2828

2929
### Scope
3030

31-
The scope of the postgres operator is on provisioning, modifying configuration
31+
The scope of the Postgres Operator is on provisioning, modifying configuration
3232
and cleaning up Postgres clusters that use Patroni, basically to make it easy
3333
and convenient to run Patroni based clusters on K8s. The provisioning
3434
and modifying includes K8s resources on one side but also e.g. database

docs/reference/cluster_manifest.md

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Cluster manifest reference
22

3-
Individual postgres clusters are described by the Kubernetes *cluster manifest*
4-
that has the structure defined by the `postgres CRD` (custom resource
3+
Individual Postgres clusters are described by the Kubernetes *cluster manifest*
4+
that has the structure defined by the `postgresql` CRD (custom resource
55
definition). The following section describes the structure of the manifest and
66
the purpose of individual keys. You can take a look at the examples of the
77
[minimal](https://github.com/zalando/postgres-operator/blob/master/manifests/minimal-postgres-manifest.yaml)
@@ -21,7 +21,7 @@ applied.
2121

2222
## Manifest structure
2323

24-
A postgres manifest is a `YAML` document. On the top level both individual
24+
A Postgres manifest is a `YAML` document. On the top level both individual
2525
parameters and parameter groups can be defined. Parameter names are written
2626
in camelCase.
2727

@@ -66,21 +66,21 @@ These parameters are grouped directly under the `spec` key in the manifest.
6666
It should be a [Spilo](https://github.com/zalando/spilo) image. Optional.
6767

6868
* **spiloFSGroup**
69-
the Persistent Volumes for the spilo pods in the StatefulSet will be owned and
69+
the Persistent Volumes for the Spilo pods in the StatefulSet will be owned and
7070
writable by the group ID specified. This will override the **spilo_fsgroup**
7171
operator parameter. This is required to run Spilo as a non-root process, but
72-
requires a custom spilo image. Note the FSGroup of a Pod cannot be changed
72+
requires a custom Spilo image. Note the FSGroup of a Pod cannot be changed
7373
without recreating a new Pod. Optional.
7474

7575
* **enableMasterLoadBalancer**
7676
boolean flag to override the operator defaults (set by the
7777
`enable_master_load_balancer` parameter) to define whether to enable the load
78-
balancer pointing to the postgres primary. Optional.
78+
balancer pointing to the Postgres primary. Optional.
7979

8080
* **enableReplicaLoadBalancer**
8181
boolean flag to override the operator defaults (set by the
8282
`enable_replica_load_balancer` parameter) to define whether to enable the
83-
load balancer pointing to the postgres standby instances. Optional.
83+
load balancer pointing to the Postgres standby instances. Optional.
8484

8585
* **allowedSourceRanges**
8686
when one or more load balancers are enabled for the cluster, this parameter
@@ -145,20 +145,20 @@ Those parameters are grouped under the `postgresql` top-level key, which is
145145
required in the manifest.
146146

147147
* **version**
148-
the postgres major version of the cluster. Looks at the [Spilo
148+
the Postgres major version of the cluster. Looks at the [Spilo
149149
project](https://github.com/zalando/spilo/releases) for the list of supported
150150
versions. Changing the cluster version once the cluster has been bootstrapped
151151
is not supported. Required field.
152152

153153
* **parameters**
154-
a dictionary of postgres parameter names and values to apply to the resulting
154+
a dictionary of Postgres parameter names and values to apply to the resulting
155155
cluster. Optional (Spilo automatically sets reasonable defaults for parameters
156156
like work_mem or max_connections).
157157

158158

159159
## Patroni parameters
160160

161-
Those parameters are grouped under the `patroni` top-level key. See the [patroni
161+
Those parameters are grouped under the `patroni` top-level key. See the [Patroni
162162
documentation](https://patroni.readthedocs.io/en/latest/SETTINGS.html) for the
163163
explanation of `ttl` and `loop_wait` parameters.
164164

@@ -180,57 +180,57 @@ explanation of `ttl` and `loop_wait` parameters.
180180
authentication. Optional.
181181

182182
* **ttl**
183-
patroni `ttl` parameter value, optional. The default is set by the Spilo
183+
Patroni `ttl` parameter value, optional. The default is set by the Spilo
184184
docker image. Optional.
185185

186186
* **loop_wait**
187-
patroni `loop_wait` parameter value, optional. The default is set by the
187+
Patroni `loop_wait` parameter value, optional. The default is set by the
188188
Spilo docker image. Optional.
189189

190190
* **retry_timeout**
191-
patroni `retry_timeout` parameter value, optional. The default is set by the
191+
Patroni `retry_timeout` parameter value, optional. The default is set by the
192192
Spilo docker image. Optional.
193193

194194
* **maximum_lag_on_failover**
195-
patroni `maximum_lag_on_failover` parameter value, optional. The default is
195+
Patroni `maximum_lag_on_failover` parameter value, optional. The default is
196196
set by the Spilo docker image. Optional.
197197

198198
* **slots**
199199
permanent replication slots that Patroni preserves after failover by
200200
re-creating them on the new primary immediately after doing a promote. Slots
201-
could be reconfigured with the help of `patronictl edit-config`. It is the
201+
could be reconfigured with the help of `Patronictl edit-config`. It is the
202202
responsibility of a user to avoid clashes in names between replication slots
203203
automatically created by Patroni for cluster members and permanent replication
204204
slots. Optional.
205205

206206
## Postgres container resources
207207

208208
Those parameters define [CPU and memory requests and limits](https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/)
209-
for the postgres container. They are grouped under the `resources` top-level
209+
for the Postgres container. They are grouped under the `resources` top-level
210210
key with subgroups `requests` and `limits`.
211211

212212
### Requests
213213

214-
CPU and memory requests for the postgres container.
214+
CPU and memory requests for the Postgres container.
215215

216216
* **cpu**
217-
CPU requests for the postgres container. Optional, overrides the
217+
CPU requests for the Postgres container. Optional, overrides the
218218
`default_cpu_requests` operator configuration parameter. Optional.
219219

220220
* **memory**
221-
memory requests for the postgres container. Optional, overrides the
221+
memory requests for the Postgres container. Optional, overrides the
222222
`default_memory_request` operator configuration parameter. Optional.
223223

224224
### Limits
225225

226-
CPU and memory limits for the postgres container.
226+
CPU and memory limits for the Postgres container.
227227

228228
* **cpu**
229-
CPU limits for the postgres container. Optional, overrides the
229+
CPU limits for the Postgres container. Optional, overrides the
230230
`default_cpu_limits` operator configuration parameter. Optional.
231231

232232
* **memory**
233-
memory limits for the postgres container. Optional, overrides the
233+
memory limits for the Postgres container. Optional, overrides the
234234
`default_memory_limits` operator configuration parameter. Optional.
235235

236236
## Parameters defining how to clone the cluster from another one
@@ -290,7 +290,7 @@ archive is supported.
290290
## EBS volume resizing
291291

292292
Those parameters are grouped under the `volume` top-level key and define the
293-
properties of the persistent storage that stores postgres data.
293+
properties of the persistent storage that stores Postgres data.
294294

295295
* **size**
296296
the size of the target EBS volume. Usual Kubernetes size modifiers, i.e. `Gi`
@@ -309,7 +309,7 @@ properties of the persistent storage that stores postgres data.
309309

310310
Those parameters are defined under the `sidecars` key. They consist of a list
311311
of dictionaries, each defining one sidecar (an extra container running
312-
along the main postgres container on the same pod). The following keys can be
312+
along the main Postgres container on the same pod). The following keys can be
313313
defined in the sidecar dictionary:
314314

315315
* **name**

docs/reference/command_line_and_environment.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ The following environment variables are accepted by the operator:
5050
`scalyr_api_key` operator parameter.
5151

5252
* **CRD_READY_WAIT_TIMEOUT**
53-
defines the timeout for the complete postgres CRD creation. When not set
53+
defines the timeout for the complete `postgresql` CRD creation. When not set
5454
default is 30s.
5555

5656
* **CRD_READY_WAIT_INTERVAL**
57-
defines the interval between consecutive attempts waiting for the postgres
57+
defines the interval between consecutive attempts waiting for the postgresql
5858
CRD to be created. The default is 5s.

docs/reference/operator_parameters.md

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ Those are top-level keys, containing both leaf keys and groups.
7777
Kubernetes-native DCS).
7878

7979
* **docker_image**
80-
Spilo docker image for postgres instances. For production, don't rely on the
80+
Spilo docker image for Postgres instances. For production, don't rely on the
8181
default image, as it might be not the most up-to-date one. Instead, build
8282
your own Spilo image from the [github
8383
repository](https://github.com/zalando/spilo).
@@ -100,12 +100,12 @@ Those are top-level keys, containing both leaf keys and groups.
100100
create/update/delete/sync clusters concurrently. The default is `4`.
101101

102102
* **max_instances**
103-
operator will cap the number of instances in any managed postgres cluster up
103+
operator will cap the number of instances in any managed Postgres cluster up
104104
to the value of this parameter. When `-1` is specified, no limits are applied.
105105
The default is `-1`.
106106

107107
* **min_instances**
108-
operator will run at least the number of instances for any given postgres
108+
operator will run at least the number of instances for any given Postgres
109109
cluster equal to the value of this parameter. When `-1` is specified, no
110110
limits are applied. The default is `-1`.
111111

@@ -121,11 +121,11 @@ Parameters describing Postgres users. In a CRD-configuration, they are grouped
121121
under the `users` key.
122122

123123
* **super_username**
124-
postgres `superuser` name to be created by `initdb`. The default is
124+
Postgres `superuser` name to be created by `initdb`. The default is
125125
`postgres`.
126126

127127
* **replication_username**
128-
postgres username used for replication between instances. The default is
128+
Postgres username used for replication between instances. The default is
129129
`standby`.
130130

131131
## Kubernetes resources
@@ -150,7 +150,7 @@ configuration they are grouped under the `kubernetes` key.
150150
This definition must bind pod service account to a role with permission
151151
sufficient for the pods to start and for Patroni to access k8s endpoints;
152152
service account on its own lacks any such rights starting with k8s v1.8. If
153-
not excplicitly defined by the user, a simple definition that binds the
153+
not explicitly defined by the user, a simple definition that binds the
154154
account to the operator's own 'zalando-postgres-operator' cluster role will
155155
be used. The default is empty.
156156

@@ -159,7 +159,7 @@ configuration they are grouped under the `kubernetes` key.
159159
after this timeout. The default is `5m`.
160160

161161
* **watched_namespace**
162-
The operator watches for postgres objects in the given namespace. If not
162+
The operator watches for Postgres objects in the given namespace. If not
163163
specified, the value is taken from the operator namespace. A special `*`
164164
value makes it watch all namespaces. The default is empty (watch the operator
165165
pod namespace).
@@ -188,7 +188,7 @@ configuration they are grouped under the `kubernetes` key.
188188
* **cluster_domain**
189189
defines the default dns domain for the kubernetes cluster the operator is
190190
running in. The default is `cluster.local`. Used by the operator to connect
191-
to the postgres clusters after creation.
191+
to the Postgres clusters after creation.
192192

193193
* **oauth_token_secret_name**
194194
a name of the secret containing the `OAuth2` token to pass to the teams API.
@@ -208,9 +208,8 @@ configuration they are grouped under the `kubernetes` key.
208208
* **inherited_labels**
209209
list of labels that can be inherited from the cluster manifest, and added to
210210
each child objects (`StatefulSet`, `Pod`, `Service` and `Endpoints`) created
211-
by the opertor.
212-
Typical use case is to dynamically pass labels that are specific to a given
213-
postgres cluster, in order to implement `NetworkPolicy`.
211+
by the operator. Typical use case is to dynamically pass labels that are
212+
specific to a given Postgres cluster, in order to implement `NetworkPolicy`.
214213
The default is empty.
215214

216215
* **cluster_name_label**
@@ -234,7 +233,7 @@ configuration they are grouped under the `kubernetes` key.
234233

235234
* **pod_environment_configmap**
236235
a name of the ConfigMap with environment variables to populate on every pod.
237-
Right now this ConfigMap is searched in the namespace of the postgres cluster.
236+
Right now this ConfigMap is searched in the namespace of the Postgres cluster.
238237
All variables from that ConfigMap are injected to the pod's environment, on
239238
conflicts they are overridden by the environment variables generated by the
240239
operator. The default is empty.
@@ -245,9 +244,9 @@ configuration they are grouped under the `kubernetes` key.
245244
be defined in advance. Default is empty (use the default priority class).
246245

247246
* **spilo_fsgroup**
248-
the Persistent Volumes for the spilo pods in the StatefulSet will be owned and
247+
the Persistent Volumes for the Spilo pods in the StatefulSet will be owned and
249248
writable by the group ID specified. This is required to run Spilo as a
250-
non-root process, but requires a custom spilo image. Note the FSGroup of a Pod
249+
non-root process, but requires a custom Spilo image. Note the FSGroup of a Pod
251250
cannot be changed without recreating a new Pod.
252251

253252
* **spilo_privileged**
@@ -283,19 +282,19 @@ Those parameters are grouped under the `postgres_pod_resources` key in a
283282
CRD-based configuration.
284283

285284
* **default_cpu_request**
286-
CPU request value for the postgres containers, unless overridden by
285+
CPU request value for the Postgres containers, unless overridden by
287286
cluster-specific settings. The default is `100m`.
288287

289288
* **default_memory_request**
290-
memory request value for the postgres containers, unless overridden by
289+
memory request value for the Postgres containers, unless overridden by
291290
cluster-specific settings. The default is `100Mi`.
292291

293292
* **default_cpu_limit**
294-
CPU limits for the postgres containers, unless overridden by cluster-specific
293+
CPU limits for the Postgres containers, unless overridden by cluster-specific
295294
settings. The default is `3`.
296295

297296
* **default_memory_limit**
298-
memory limits for the postgres containers, unless overridden by cluster-specific
297+
memory limits for the Postgres containers, unless overridden by cluster-specific
299298
settings. The default is `1Gi`.
300299

301300
* **set_memory_request_to_limit**
@@ -336,11 +335,11 @@ CRD-based configuration.
336335
cluster or recreating pods. The default is `10m`.
337336

338337
* **ready_wait_interval**
339-
the interval between consecutive attempts waiting for the postgres CRD to be
340-
created. The default is `5s`.
338+
the interval between consecutive attempts waiting for the `postgresql` CRD to
339+
be created. The default is `5s`.
341340

342341
* **ready_wait_timeout**
343-
the timeout for the complete postgres CRD creation. The default is `30s`.
342+
the timeout for the complete `postgresql` CRD creation. The default is `30s`.
344343

345344
## Load balancer related options
346345

@@ -396,7 +395,7 @@ yet officially supported.
396395
Spilo are S3 and GCS. The default is empty.
397396

398397
* **log_s3_bucket**
399-
S3 bucket to use for shipping postgres daily logs. Works only with S3 on AWS.
398+
S3 bucket to use for shipping Postgres daily logs. Works only with S3 on AWS.
400399
The bucket has to be present and accessible by Postgres pods. The default is
401400
empty.
402401

@@ -447,7 +446,7 @@ Options to aid debugging of the operator itself. Grouped under the `debug` key.
447446

448447
* **enable_database_access**
449448
boolean parameter that toggles the functionality of the operator that require
450-
access to the postgres database, i.e. creating databases and users. The
449+
access to the Postgres database, i.e. creating databases and users. The
451450
default is `true`.
452451

453452
## Automatic creation of human users in the database
@@ -466,7 +465,7 @@ key.
466465
`https://teams.example.com/api/`.
467466

468467
* **team_api_role_configuration**
469-
postgres parameters to apply to each team member role. The default is
468+
Postgres parameters to apply to each team member role. The default is
470469
'*log_statement:all*'. It is possible to supply multiple options, separating
471470
them by commas. Options containing commas within the value are not supported,
472471
with the exception of the `search_path`. For instance:

docs/user.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ Things to note:
300300
- An empty string is provided in `s3_wal_path` of the standby cluster will
301301
result in error and no statefulset will be created.
302302
- Only one pod can be deployed for stand-by cluster.
303-
- To manually promote the standby_cluster, use patronictl and remove config
303+
- To manually promote the standby_cluster, use `patronictl` and remove config
304304
entry.
305305
- There is no way to transform a non-standby cluster to become a standby cluster
306306
through operator. Hence, if a cluster is created without standby section in

0 commit comments

Comments
 (0)