Skip to content

Commit 62c8490

Browse files
author
Jonathan S. Katz
committed
Create "pgo-config" ConfigMap if not provided
The Operator (and associated containers) will create the pgo-config ConfigMap from the stored default configuration if the pgo-config ConfigMap is not present. This allows for the editing of "default configuration" after the Operator is deployed, and allows for the removal of the pgo-config creation step from several of the installation methods. Issue: [ch9451]
1 parent 6622060 commit 62c8490

File tree

5 files changed

+111
-113
lines changed

5 files changed

+111
-113
lines changed

docs/content/Configuration/configuration.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ The configuration files used by the Operator are found in 2 places:
1616
* the pgo-config ConfigMap in the namespace the Operator is running in
1717
* or, a copy of the configuration files are also included by default into the Operator container images themselves to support a very simplistic deployment of the Operator
1818

19-
If the pgo-config ConfigMap is not found by the Operator, it will use
20-
the configuration files that are included in the Operator container
21-
images.
19+
If the `pgo-config` ConfigMap is not found by the Operator, it will create a
20+
`pgo-config` ConfigMap using the configuration files that are included in the
21+
Operator container.
2222

2323
## conf/postgres-operator/pgo.yaml
2424
The *pgo.yaml* file sets many different Operator configuration settings and is described in the [pgo.yaml configuration]({{< ref "pgo-yaml-configuration.md" >}}) documentation section.

docs/content/installation/other/operator-hub.md

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -43,19 +43,6 @@ git clone -b v{{< param operatorVersion >}} https://github.com/CrunchyData/postg
4343
cd postgres-operator
4444
```
4545

46-
### PostgreSQL Operator Configuration
47-
48-
Edit `conf/postgres-operator/pgo.yaml` to configure the deployment. Look over all of the options and make any
49-
changes necessary for your environment. A full description of each option is available in the
50-
[`pgo.yaml` configuration guide]({{< relref "configuration/pgo-yaml-configuration.md" >}}).
51-
52-
When the file is ready, upload the entire directory to the `pgo-config` ConfigMap.
53-
54-
```
55-
kubectl -n "$PGO_OPERATOR_NAMESPACE" create configmap pgo-config \
56-
--from-file=./conf/postgres-operator
57-
```
58-
5946
### Secrets
6047

6148
Configure pgBackRest for your environment. If you do not plan to use AWS S3 to store backups, you can omit
@@ -152,4 +139,3 @@ pgo version
152139
# pgo client version {{< param operatorVersion >}}
153140
# pgo-apiserver version {{< param operatorVersion >}}
154141
```
155-

installers/olm/description.openshift.md

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -63,20 +63,6 @@ edit `conf/postgres-operator/pgo.yaml` and set `DisableFSGroup` to `true`.
6363

6464
[Security Context Constraint]: https://docs.openshift.com/container-platform/latest/authentication/managing-security-context-constraints.html
6565

66-
### PostgreSQL Operator Configuration
67-
68-
Edit `conf/postgres-operator/pgo.yaml` to configure the deployment. Look over all of the options and make any
69-
changes necessary for your environment. A [full description of each option][pgo-yaml-reference] is available in the documentation.
70-
71-
[pgo-yaml-reference]: https://access.crunchydata.com/documentation/postgres-operator/${PGO_VERSION}/configuration/pgo-yaml-configuration/
72-
73-
When the file is ready, upload the entire directory to the `pgo-config` ConfigMap.
74-
75-
```
76-
oc -n "$PGO_OPERATOR_NAMESPACE" create configmap pgo-config \
77-
--from-file=./conf/postgres-operator
78-
```
79-
8066
### Secrets
8167

8268
Configure pgBackRest for your environment. If you do not plan to use AWS S3 to store backups, you can omit

installers/olm/description.upstream.md

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -56,20 +56,6 @@ git clone -b v${PGO_VERSION} https://github.com/CrunchyData/postgres-operator.gi
5656
cd postgres-operator
5757
```
5858

59-
### PostgreSQL Operator Configuration
60-
61-
Edit `conf/postgres-operator/pgo.yaml` to configure the deployment. Look over all of the options and make any
62-
changes necessary for your environment. A [full description of each option][pgo-yaml-reference] is available in the documentation.
63-
64-
[pgo-yaml-reference]: https://access.crunchydata.com/documentation/postgres-operator/${PGO_VERSION}/configuration/pgo-yaml-configuration/
65-
66-
When the file is ready, upload the entire directory to the `pgo-config` ConfigMap.
67-
68-
```
69-
kubectl -n "$PGO_OPERATOR_NAMESPACE" create configmap pgo-config \
70-
--from-file=./conf/postgres-operator
71-
```
72-
7359
### Secrets
7460

7561
Configure pgBackRest for your environment. If you do not plan to use AWS S3 to store backups, you can omit

0 commit comments

Comments
 (0)