Skip to content

Commit 4fc5822

Browse files
authored
Update docs for v1.2 (zalando#609)
* update docs and move parts from README to index.md * fix typos, headings and code alignment in docs
1 parent 1c340c6 commit 4fc5822

17 files changed

+686
-615
lines changed

CONTRIBUTING.md

+10-6
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

README.md

+24-54
Original file line numberDiff line numberDiff line change
@@ -8,69 +8,39 @@
88

99
<img src="docs/diagrams/logo.png" width="200">
1010

11-
## Introduction to the Postgres Operator
11+
The Postgres Operator enables highly-available [PostgreSQL](https://www.postgresql.org/)
12+
clusters on Kubernetes (K8s) powered by [Patroni](https://github.com/zalando/spilo).
13+
It is configured only through manifests to ease integration into automated CI/CD
14+
pipelines with no access to Kubernetes directly.
1215

13-
The Postgres [operator](https://coreos.com/blog/introducing-operators.html)
14-
manages PostgreSQL clusters on Kubernetes:
16+
The Postgres Operator has been developed at Zalando and is being used in
17+
production for over two years.
1518

16-
1. The operator watches additions, updates, and deletions of PostgreSQL cluster
17-
manifests and changes the running clusters accordingly. For example, when a
18-
user submits a new manifest, the operator spawns a new Postgres cluster with
19-
necessary entities such as StatefulSets, Services, and also Postgres roles. See this
20-
[Postgres cluster manifest](manifests/complete-postgres-manifest.yaml)
21-
for settings that a manifest may contain.
19+
## Getting started
2220

23-
2. The operator also watches updates to [its own configuration](manifests/configmap.yaml)
24-
and alters running Postgres clusters if necessary. For instance, if a pod
25-
Docker image is changed, the operator carries out the rolling update. That
26-
is, the operator re-spawns one-by-one pods of each StatefulSet it manages
27-
with the new Docker image.
21+
For a quick first impression follow the instructions of this
22+
[tutorial](docs/quickstart.md).
2823

29-
3. Finally, the operator periodically synchronizes the actual state of each
30-
Postgres cluster with the desired state defined in the cluster's manifest.
24+
## Documentation
3125

32-
4. The operator aims to be hands free and configuration happens only via manifests and its own config.
33-
This enables easy integration in automated deploy pipelines with no access to Kubernetes directly.
26+
There is a browser-friendly version of this documentation at
27+
[postgres-operator.readthedocs.io](https://postgres-operator.readthedocs.io)
3428

35-
# Getting started
29+
* [How it works](docs/index.md)
30+
* [The Postgres experience on K8s](docs/user.md)
31+
* [DBA options - from RBAC to backup](docs/administrator.md)
32+
* [Debug and extend the operator](docs/developer.md)
33+
* [Configuration options](docs/reference/operator_parameters.md)
34+
* [Postgres manifest reference](docs/reference/cluster_manifest.md)
35+
* [Command-line options and environment variables](docs/reference/command_line_and_environment.md)
3636

37-
For a quick first impression follow the instructions of [this](docs/quickstart.md)
38-
tutorial.
37+
## Google Summer of Code
3938

40-
# Google Summer of Code
39+
The Postgres Operator made it to the [Google Summer of Code 2019](https://summerofcode.withgoogle.com/organizations/5429926902104064/)!
40+
Check [our ideas](docs/gsoc-2019/ideas.md#google-summer-of-code-2019)
41+
and start discussions in [the issue tracker](https://github.com/zalando/postgres-operator/issues).
4142

42-
The Postgres Operator made it to the [Google Summer of Code 2019](https://summerofcode.withgoogle.com/)! As a brand new mentoring organization, we are now looking for our first mentees. Check [our ideas](https://github.com/zalando/postgres-operator/blob/master/docs/gsoc-2019/ideas.md#google-summer-of-code-2019) and start discussion in [the issue tracker](https://github.com/zalando/postgres-operator/issues). And don't forget to spread a word about our GSoC participation to attract even more students.
43-
44-
## Table of contents
45-
46-
* [concepts](docs/index.md)
47-
* [user documentation](docs/user.md)
48-
* [administrator documentation](docs/administrator.md)
49-
* [developer documentation](docs/developer.md)
50-
* [operator configuration reference](docs/reference/operator_parameters.md)
51-
* [cluster manifest reference](docs/reference/cluster_manifest.md)
52-
* [command-line options and environment variables](docs/reference/command_line_and_environment.md)
53-
54-
The rest of this document is a tutorial to get you up and running locally with the operator on Minikube.
55-
56-
## Overview of involved entities
57-
58-
Here is a diagram, that summarizes what would be created by the operator, when a
59-
new Postgres cluster CRD is submitted:
60-
61-
![postgresql-operator](docs/diagrams/operator.png "K8S resources, created by operator")
62-
63-
This picture is not complete without an overview of what is inside a single cluster pod, so
64-
let's zoom in:
65-
66-
![pod](docs/diagrams/pod.png "Database pod components")
67-
68-
These two diagrams should help you to understand the basics of what kind of
69-
functionality the operator provides.
70-
71-
There is a browser-friendly version of this documentation at [postgres-operator.readthedocs.io](https://postgres-operator.readthedocs.io)
72-
73-
## Community
43+
## Community
7444

7545
There are two places to get in touch with the community:
7646
1. The [GitHub issue tracker](https://github.com/zalando/postgres-operator/issues)

charts/postgres-operator/Chart.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: postgres-operator
33
version: 1.2.0
44
appVersion: 1.2.0
55
home: https://github.com/zalando/postgres-operator
6-
description: Postgres operator creates and manages PostgreSQL clusters running in Kubernetes
6+
description: Postgres Operator creates and manages PostgreSQL clusters running in Kubernetes
77
keywords:
88
- postgres
99
- operator
@@ -16,5 +16,5 @@ maintainers:
1616
- name: kimxogus
1717
1818
sources:
19-
- https://github.com/zalando-incubator/postgres-operator
19+
- https://github.com/zalando/postgres-operator
2020
engine: gotpl

charts/postgres-operator/values-crd.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ serviceAccount:
243243
create: true
244244
# The name of the ServiceAccount to use.
245245
# If not set and create is true, a name is generated using the fullname template
246-
# When relying solely on the OperatorConfiguration CRD, set this value to "operator"
246+
# When relying solely on the OperatorConfiguration CRD, this value has to be "operator"
247247
# Otherwise, the operator tries to use the "default" service account which is forbidden
248248
name: operator
249249

charts/postgres-operator/values.yaml

-2
Original file line numberDiff line numberDiff line change
@@ -224,8 +224,6 @@ serviceAccount:
224224
create: true
225225
# The name of the ServiceAccount to use.
226226
# If not set and create is true, a name is generated using the fullname template
227-
# When relying solely on the OperatorConfiguration CRD, set this value to "operator"
228-
# Otherwise, the operator tries to use the "default" service account which is forbidden
229227
name:
230228

231229
priorityClassName: ""

docker/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ RUN apk --no-cache add ca-certificates
77
COPY build/* /
88

99
RUN addgroup -g 1000 pgo
10-
RUN adduser -D -u 1000 -G pgo -g 'Postgres operator' pgo
10+
RUN adduser -D -u 1000 -G pgo -g 'Postgres Operator' pgo
1111

1212
USER 1000:1000
1313

docker/logical-backup/dump.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ set -o pipefail
77
IFS=$'\n\t'
88

99
# make script trace visible via `kubectl logs`
10-
set -o xtrace
10+
set -o xtrace
1111

1212
ALL_DB_SIZE_QUERY="select sum(pg_database_size(datname)::numeric) from pg_database;"
1313
PG_BIN=$PG_DIR/$PG_VERSION/bin
@@ -35,7 +35,7 @@ function aws_upload {
3535

3636
# mimic bucket setup from Spilo
3737
# to keep logical backups at the same path as WAL
38-
# NB: $LOGICAL_BACKUP_S3_BUCKET_SCOPE_SUFFIX already contains the leading "/" when set by the Postgres operator
38+
# NB: $LOGICAL_BACKUP_S3_BUCKET_SCOPE_SUFFIX already contains the leading "/" when set by the Postgres Operator
3939
PATH_TO_BACKUP=s3://$LOGICAL_BACKUP_S3_BUCKET"/spilo/"$SCOPE$LOGICAL_BACKUP_S3_BUCKET_SCOPE_SUFFIX"/logical_backups/"$(date +%s).sql.gz
4040

4141
if [ -z "$EXPECTED_SIZE" ]; then

0 commit comments

Comments
 (0)