+ 
-
+
+ 
-## Run your own production-grade PostgreSQL-as-a-Service on Kubernetes!
+## Run [Cloud Native PostgreSQL on Kubernetes](https://www.crunchydata.com/products/crunchy-postgresql-for-kubernetes/) with PGO: The [Postgres Operator](https://github.com/CrunchyData/postgres-operator) from [Crunchy Data](https://www.crunchydata.com/)!
Latest Release: {{< param operatorVersion >}}
-The [Crunchy PostgreSQL Operator](https://www.crunchydata.com/developers/download-postgres/containers/postgres-operator) automates and simplifies deploying and managing open source PostgreSQL clusters on Kubernetes and other Kubernetes-enabled Platforms by providing the essential features you need to keep your PostgreSQL clusters up and running, including:
+[PGO](https://www.crunchydata.com/developers/download-postgres/containers/postgres-operator),
+the [Postgres Operator](https://github.com/CrunchyData/postgres-operator)
+developed by [Crunchy Data](https://crunchydata.com/) and included in
+[Crunchy PostgreSQL for Kubernetes](https://www.crunchydata.com/products/crunchy-postgresql-for-kubernetes/),
+automates and simplifies deploying and managing open source PostgreSQL clusters
+on Kubernetes.
-#### PostgreSQL Cluster Provisioning
+Whether you need to get a simple Postgres cluster up and running, need to deploy
+a high availability, fault tolerant cluster in production, or are running your
+own database-as-a-service, the PostgreSQL Operator provides the essential
+features you need to keep your cloud native Postgres clusters healthy, including:
+
+#### Postgres Cluster [Provisioning]({{< relref "/architecture/provisioning.md" >}})
[Create, Scale, & Delete PostgreSQL clusters with ease](/architecture/provisioning/), while fully customizing your Pods and PostgreSQL configuration!
@@ -30,7 +40,7 @@ Backups and restores leverage the open source [pgBackRest](https://www.pgbackres
#### TLS
-Secure communication between your applications and data servers by [enabling TLS for your PostgreSQL servers](/pgo-client/common-tasks/#enable-tls), including the ability to enforce that all of your connections to use TLS.
+Secure communication between your applications and data servers by [enabling TLS for your PostgreSQL servers](/pgo-client/common-tasks/#enable-tls), including the ability to enforce all of your connections to use TLS.
#### Monitoring
@@ -70,16 +80,22 @@ Choose the type of backup (full, incremental, differential) and [how frequently
#### Multi-Namespace Support
-You can control how the PostgreSQL Operator leverages [Kubernetes Namespaces](https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/) with several different deployment models:
+You can control how PGO, the Postgres Operator, leverages [Kubernetes Namespaces](https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/) with several different deployment models:
-- Deploy the PostgreSQL Operator and all PostgreSQL clusters to the same namespace
-- Deploy the PostgreSQL Operator to one namespaces, and all PostgreSQL clusters to a different namespace
-- Deploy the PostgreSQL Operator to one namespace, and have your PostgreSQL clusters managed acrossed multiple namespaces
-- Dynamically add and remove namespaces managed by the PostgreSQL Operator using the `pgo create namespace` and `pgo delete namespace` commands
+- Deploy PGO and all PostgreSQL clusters to the same namespace
+- Deploy PGO to one namespaces, and all PostgreSQL clusters to a different
+namespace
+- Deploy PGO to one namespace, and have your PostgreSQL clusters managed across
+multiple namespaces
+- Dynamically add and remove namespaces managed by the PostgreSQL Operator using
+the `pgo` client to run `pgo create namespace` and `pgo delete namespace`
#### Full Customizability
-The Crunchy PostgreSQL Operator makes it easy to get your own PostgreSQL-as-a-Service up and running on Kubernetes-enabled platforms, but we know that there are further customizations that you can make. As such, the Crunchy PostgreSQL Operator allows you to further customize your deployments, including:
+The Postgres Operator (PGO) makes it easy to get Postgres up and running on
+Kubernetes-enabled platforms, but we know that there are further customizations
+that you can make. As such, PGO allows you to further customize your
+deployments, including:
- Selecting different storage classes for your primary, replica, and backup storage
- Select your own container resources class for each PostgreSQL cluster deployment; differentiate between resources applied for primary and replica clusters!
@@ -95,25 +111,64 @@ The Crunchy PostgreSQL Operator makes it easy to get your own PostgreSQL-as-a-Se
The Crunchy PostgreSQL Operator extends Kubernetes to provide a higher-level abstraction for rapid creation and management of PostgreSQL clusters. The Crunchy PostgreSQL Operator leverages a Kubernetes concept referred to as "[Custom Resources](https://kubernetes.io/docs/concepts/extend-kubernetes/api-extension/custom-resources/)” to create several [custom resource definitions (CRDs)](https://kubernetes.io/docs/concepts/extend-kubernetes/api-extension/custom-resources/#customresourcedefinitions) that allow for the management of PostgreSQL clusters.
+# Included Components
+
+[PostgreSQL containers](https://github.com/CrunchyData/crunchy-containers) deployed with the PostgreSQL Operator include the following components:
+
+- [PostgreSQL](https://www.postgresql.org)
+ - [PostgreSQL Contrib Modules](https://www.postgresql.org/docs/current/contrib.html)
+ - [PL/Python + PL/Python 3](https://www.postgresql.org/docs/current/plpython.html)
+ - [pgAudit](https://www.pgaudit.org/)
+ - [pgAudit Analyze](https://github.com/pgaudit/pgaudit_analyze)
+ - [set_user](https://github.com/pgaudit/set_user)
+- [pgBackRest](https://pgbackrest.org/)
+- [pgBouncer](http://pgbouncer.github.io/)
+- [pgAdmin 4](https://www.pgadmin.org/)
+- [pgMonitor](https://github.com/CrunchyData/pgmonitor)
+- [Patroni](https://patroni.readthedocs.io/)
+- [LLVM](https://llvm.org/) (for [JIT compilation](https://www.postgresql.org/docs/current/jit.html))
+
+In addition to the above, the geospatially enhanced PostgreSQL + PostGIS container adds the following components:
+
+- [PostGIS](http://postgis.net/)
+- [pgRouting](https://pgrouting.org/)
+- [PL/R](https://github.com/postgres-plr/plr)
+
+Additional containers that are not directly integrated with the PostgreSQL Operator but can work alongside it include:
+
+- [pgPool II](https://access.crunchydata.com/documentation/crunchy-postgres-containers/latest/container-specifications/crunchy-pgpool/)
+- [pg_upgrade](https://access.crunchydata.com/documentation/crunchy-postgres-containers/latest/container-specifications/crunchy-upgrade/)
+- [pgBench](https://access.crunchydata.com/documentation/crunchy-postgres-containers/latest/container-specifications/crunchy-pgbench/)
+
+For more information about which versions of the PostgreSQL Operator include which components, please visit the [compatibility]({{< relref "configuration/compatibility.md" >}}) section of the documentation.
+
# Supported Platforms
-The Crunchy PostgreSQL Operator is tested on the following Platforms:
+PGO, the Postgres Operator, is Kubernetes-native and maintains backwards
+compatibility to Kubernetes 1.11 and is tested is tested against the following
+platforms:
- Kubernetes 1.13+
- OpenShift 3.11+
- Google Kubernetes Engine (GKE), including Anthos
-- VMware Enterprise PKS 1.3+
+- Amazon EKS
+- Microsoft AKS
+- VMware Tanzu
-## Storage
+This list only includes the platforms that the Postgres Operator is specifically
+tested on as part of the release process: PGO works on other Kubernetes
+distributions as well.
-The Crunchy PostgreSQL Operator is tested with a variety of different types of Kubernetes storage and Storage Classes, including:
+## Storage
-- Rook
-- StorageOS
-- Google Compute Engine persistent volumes
-- NFS
-- HostPath
+PGO, the Postgres Operator, is tested with a variety of different types of
+Kubernetes storage and Storage Classes, as well as hostPath and NFS.
-and more. We have had reports of people using the PostgreSQL Operator with other [Storage Classes](https://kubernetes.io/docs/concepts/storage/storage-classes/) as well.
+We know there are a variety of different types of [Storage Classes](https://kubernetes.io/docs/concepts/storage/storage-classes/)
+available for Kubernetes and we do our best to test each one, but due to the
+breadth of this area we are unable to verify Postgres Operator functionality in
+each one. With that said, the PostgreSQL Operator is designed to be storage
+class agnostic and has been demonstrated to work with additional Storage
+Classes.
-We know there are a variety of different types of [Storage Classes](https://kubernetes.io/docs/concepts/storage/storage-classes/) available for Kubernetes and we do our best to test each one, but due to the breadth of this area we are unable to verify PostgreSQL Operator functionality in each one. With that said, the PostgreSQL Operator is designed to be storage class agnostic and has been demonstrated to work with additional Storage Classes. Storage is a rapidly evolving field in Kubernetes and we will continue to adapt the PostgreSQL Operator to modern Kubernetes storage standards.
+The PGO Postgres Operator project source code is available subject to the [Apache 2.0 license](https://raw.githubusercontent.com/CrunchyData/postgres-operator/master/LICENSE.md) with the PGO logo and branding assets covered by [our trademark guidelines](/logos/TRADEMARKS.md).
diff --git a/docs/content/architecture/disaster-recovery.md b/docs/content/architecture/disaster-recovery.md
index deee66dcc5..7833661e07 100644
--- a/docs/content/architecture/disaster-recovery.md
+++ b/docs/content/architecture/disaster-recovery.md
@@ -196,7 +196,7 @@ to re-enable autofail if you would like your PostgreSQL cluster to be
highly-available. You can re-enable autofail with this command:
```shell
-pgo update cluster hacluster --autofail=true
+pgo update cluster hacluster --enable-autofail
```
## Scheduling Backups
diff --git a/docs/content/architecture/high-availability/multi-cluster-kubernetes.md b/docs/content/architecture/high-availability/multi-cluster-kubernetes.md
index c6043adba4..f2be1e03c5 100644
--- a/docs/content/architecture/high-availability/multi-cluster-kubernetes.md
+++ b/docs/content/architecture/high-availability/multi-cluster-kubernetes.md
@@ -93,6 +93,14 @@ that matches that of the active cluster it is replicating.
- `--pgbackrest-s3-endpoint`: The S3 endpoint to use
- `--pgbackrest-s3-region`: The S3 region to use
+If you do not want to set the user credentials, you can retrieve them at a later
+time by using the [`pgo show user`]({{< relref "/pgo-client/reference/pgo_show_user.md" >}})
+command with the `--show-system-accounts` flag, e.g.
+
+```
+pgo show user --show-system-accounts hippo
+```
+
With respect to the credentials, it should be noted that when the standby
cluster is being created within the same Kubernetes cluster AND it has access to
the Kubernetes Secret created for the active cluster, one can use the
@@ -182,6 +190,9 @@ pgo create cluster hippo-standby --standby --pgbouncer --replica-count=2 \
--password=opensourcehippo
```
+(If you are unsure of your credentials, you can use
+`pgo show user hippo --show-system-accounts` to retrieve them).
+
Note the use of the `--pgbackrest-repo-path` flag as it points to the name of
the pgBackRest repository that is used for the original `hippo` cluster.
diff --git a/docs/content/architecture/namespace.md b/docs/content/architecture/namespace.md
index f6b4265723..1a551a8b91 100644
--- a/docs/content/architecture/namespace.md
+++ b/docs/content/architecture/namespace.md
@@ -34,8 +34,8 @@ settings.
Enables full dynamic namespace capabilities, in which the Operator can create, delete and update
any namespaces within a Kubernetes cluster. With `dynamic` mode enabled, the PostgreSQL Operator
-can respond to namespace events in a Kubernetes cluster, such as when a namespace is created, and
-take an appropriate action, such as adding the PostgreSQL Operator controllers for the newly
+can respond to namespace events in a Kubernetes cluster, such as when a namespace is created, and
+take an appropriate action, such as adding the PostgreSQL Operator controllers for the newly
created namespace.
The following defines the namespace permissions required for the `dynamic` mode to be enabled:
@@ -62,8 +62,8 @@ rules:
### `readonly`
-In `readonly` mode, the PostgreSQL Operator is still able to listen to namespace events within a
-Kubernetes cluster, but it can no longer modify (create, update, delete) namespaces. For example,
+In `readonly` mode, the PostgreSQL Operator is still able to listen to namespace events within a
+Kubernetes cluster, but it can no longer modify (create, update, delete) namespaces. For example,
if a Kubernetes administrator creates a namespace, the PostgreSQL Operator can respond and create
controllers for that namespace.
@@ -95,7 +95,7 @@ Operator is unable to dynamically respond to namespace events in the cluster, i
target namespaces are deleted or new target namespaces need to be added, the PostgreSQL Operator
will need to be re-deployed.
-Please note that it is important to redeploy the PostgreSQL Operator following the deletion of a
+Please note that it is important to redeploy the PostgreSQL Operator following the deletion of a
target namespace to ensure it no longer attempts to listen for events in that namespace.
The `disabled` mode is enabled the when the PostgreSQL Operator has not been assigned namespace
@@ -103,22 +103,22 @@ permissions.
## RBAC Reconciliation
-By default, the PostgreSQL Operator will attempt to reconcile RBAC resources (ServiceAccounts,
+By default, the PostgreSQL Operator will attempt to reconcile RBAC resources (ServiceAccounts,
Roles and RoleBindings) within each namespace configured for the PostgreSQL Operator installation.
This allows the PostgreSQL Operator to create, update and delete the various RBAC resources it
requires in order to properly create and manage PostgreSQL clusters within each targeted namespace
(this includes self-healing RBAC resources as needed if removed and/or misconfigured).
In order for RBAC reconciliation to function properly, the PostgreSQL Operator ServiceAccount must
-be assigned a certain set of permissions. While the PostgreSQL Operator is not concerned with
+be assigned a certain set of permissions. While the PostgreSQL Operator is not concerned with
exactly how it has been assigned the permissions required to reconcile RBAC in each target
-namespace, the various [installation methods]({{< relref "installation" >}}) supported by the
+namespace, the various [installation methods]({{< relref "installation" >}}) supported by the
PostgreSQL Operator install a recommended set permissions based on the specific Namespace Operating
Mode enabled (see section [Namespace Operating Modes]({{< relref "#namespace-operating-modes" >}})
above for more information regarding the various Namespace Operating Modes available).
-The following section defines the recommended set of permissions that should be assigned to the
-PostgreSQL Operator ServiceAccount in order to ensure proper RBAC reconciliation based on the
+The following section defines the recommended set of permissions that should be assigned to the
+PostgreSQL Operator ServiceAccount in order to ensure proper RBAC reconciliation based on the
specific Namespace Operating Mode enabled. Please note that each PostgreSQL Operator installation
method handles the initial configuration and setup of the permissions shown below based on the
Namespace Operating Mode configured during installation.
@@ -127,7 +127,7 @@ Namespace Operating Mode configured during installation.
When using the `dynamic` Namespace Operating Mode, it is recommended that the PostgreSQL Operator
ServiceAccount be granted permissions to manage RBAC inside any namespace in the Kubernetes cluster
-via a ClusterRole. This allows for a fully-hands off approach to managing RBAC within each
+via a ClusterRole. This allows for a fully-hands off approach to managing RBAC within each
targeted namespace space. In other words, as namespaces are added and removed post-installation of
the PostgreSQL Operator (e.g. using `pgo create namespace` or `pgo delete namespace`), the Operator
is able to automatically reconcile RBAC in those namespaces without the need for any external
@@ -170,8 +170,6 @@ rules:
- endpoints
- pods
- pods/exec
- - pods/log
- - replicasets
- secrets
- services
- persistentvolumeclaims
@@ -184,10 +182,19 @@ rules:
- update
- delete
- deletecollection
+ - apiGroups:
+ - ''
+ resources:
+ - pods/log
+ verbs:
+ - get
+ - list
+ - watch
- apiGroups:
- apps
resources:
- deployments
+ - replicasets
verbs:
- get
- list
@@ -230,7 +237,7 @@ rules:
### `readonly` & `disabled` Namespace Operating Modes
-When using the `readonly` or `disabled` Namespace Operating Modes, it is recommended that the
+When using the `readonly` or `disabled` Namespace Operating Modes, it is recommended that the
PostgreSQL Operator ServiceAccount be granted permissions to manage RBAC inside of any configured
namespaces using local Roles within each targeted namespace. This means that as new namespaces
are added and removed post-installation of the PostgreSQL Operator, an administrator must manually
diff --git a/docs/content/custom-resources/_index.md b/docs/content/custom-resources/_index.md
index abf7bb7c25..9058d8a1da 100644
--- a/docs/content/custom-resources/_index.md
+++ b/docs/content/custom-resources/_index.md
@@ -260,6 +260,12 @@ export pgbackrest_public_key="${public_key_temp//[$'\n']}" pgbackrest_private_ke
# create the backrest-repo-config example file and substitute in the newly
# created keys
+#
+# (Note: that the "config" / "sshd_config" entries contain configuration to
+# ensure that PostgreSQL instances are able to communicate with the pgBackRest
+# repository, which houses backups and archives, and vice versa. Most of the
+# settings follow the sshd defaults, with a few overrides. Edit at your own
+# discretion.)
cat <<-EOF > "${pgo_cluster_name}-backrest-repo-config.yaml"
apiVersion: v1
kind: Secret
diff --git a/docs/content/installation/_index.md b/docs/content/installation/_index.md
index 909561ce46..036a080a4e 100644
--- a/docs/content/installation/_index.md
+++ b/docs/content/installation/_index.md
@@ -5,10 +5,10 @@ draft: false
weight: 40
---
-There are several different ways to install and deploy the [PostgreSQL Operator](https://www.crunchydata.com/developers/download-postgres/containers/postgres-operator)
+There are several different ways to install and deploy the [PGO, the Postgres Operator](https://www.crunchydata.com/developers/download-postgres/containers/postgres-operator)
based upon your use case.
-For the vast majority of use cases, we recommend using the [PostgreSQL Operator Installer]({{< relref "/installation/postgres-operator.md" >}}),
+For the vast majority of use cases, we recommend using the [Postgres Operator Installer]({{< relref "/installation/postgres-operator.md" >}}),
which uses the `pgo-deployer` container to set up all of the objects required to
run the PostgreSQL Operator.
diff --git a/docs/content/installation/configuration.md b/docs/content/installation/configuration.md
index 057ee739a3..1fab361907 100644
--- a/docs/content/installation/configuration.md
+++ b/docs/content/installation/configuration.md
@@ -5,9 +5,9 @@ draft: false
weight: 40
---
-# PostgreSQL Operator Installer Configuration
+# PGO Installer Configuration
-When installing the PostgreSQL Operator you have many configuration options, these
+When installing PGO, the Postgres Operator you have many configuration options, these
options are listed in this section.
## General Configuration
diff --git a/docs/content/installation/other/_index.md b/docs/content/installation/other/_index.md
index 9cb7caaef6..8044c3f07c 100644
--- a/docs/content/installation/other/_index.md
+++ b/docs/content/installation/other/_index.md
@@ -6,6 +6,6 @@ weight: 100
---
Though the years, we have built up several other methods for installing the
-PostgreSQL Operator. The next few sections provide some alternative ways of
+PGO. The next few sections provide some alternative ways of
deploying the PostgreSQL Operator. Some of these methods are deprecated and may
be removed in a future release.
diff --git a/docs/content/installation/other/ansible/_index.md b/docs/content/installation/other/ansible/_index.md
index 0cd09a034d..69a647511e 100644
--- a/docs/content/installation/other/ansible/_index.md
+++ b/docs/content/installation/other/ansible/_index.md
@@ -5,17 +5,17 @@ draft: false
weight: 100
---
-# Crunchy Data PostgreSQL Operator Playbooks
+# PGO: Postgres Operator Playbooks
-The Crunchy Data PostgreSQL Operator Playbooks contain [Ansible](https://www.ansible.com/)
+PGO, the Postgres Operator from Crunchy Data, Playbooks contain [Ansible](https://www.ansible.com/)
roles for installing and managing the [Crunchy Data PostgreSQL Operator]({{< relref "/installation/other/ansible/installing-operator.md" >}}).
## Features
The playbooks provided allow users to:
-* install PostgreSQL Operator on Kubernetes and OpenShift
-* install PostgreSQL Operator from a Linux, Mac or Windows (Ubuntu subsystem) host
+* install PGO on Kubernetes and OpenShift
+* install PGO from a Linux, Mac or Windows (Ubuntu subsystem) host
* generate TLS certificates required by the PostgreSQL Operator
* support a variety of deployment models
diff --git a/docs/content/installation/other/bash.md b/docs/content/installation/other/bash.md
index 40b9bd3e76..3a62fd51e5 100644
--- a/docs/content/installation/other/bash.md
+++ b/docs/content/installation/other/bash.md
@@ -5,18 +5,18 @@ draft: false
weight: 200
---
-A full installation of the Operator includes the following steps:
+A full installation of PGO includes the following steps:
- create a project structure
- configure your environment variables
- - configure Operator templates
+ - configure PGO templates
- create security resources
- deploy the operator
- - install pgo CLI (end user command tool)
+ - install `pgo` client (end user command tool)
-Operator end-users are only required to install the pgo CLI client on their host and can skip the server-side installation steps. pgo CLI clients are provided for Linux, Mac, and Windows clients.
+PGO end-users are only required to install the `pgo` client on their host and can skip the server-side installation steps. `pgo` clients are provided for Linux, Mac, and Windows clients.
-The Operator can be deployed by multiple methods including:
+PGO can be deployed by multiple methods including:
* default installation
* Ansible playbook installation
@@ -25,7 +25,7 @@ The Operator can be deployed by multiple methods including:
## Default Installation - Create Project Structure
-The Operator follows a golang project structure, you can create a structure as follows on your local Linux host:
+PGO follows a golang project structure, you can create a structure as follows on your local Linux host:
mkdir -p $HOME/odev/src/github.com/crunchydata $HOME/odev/bin $HOME/odev/pkg
cd $HOME/odev/src/github.com/crunchydata
@@ -59,9 +59,9 @@ for Kubernetes events. This value is set as follows:
This means namespaces called *pgouser1* and *pgouser2* will be
created as part of the default installation.
-{{% notice warning %}}In Kubernetes versions prior to 1.12 (including Openshift up through 3.11), there is a limitation that requires an extra step during installation for the operator to function properly with watched namespaces. This limitation does not exist when using Kubernetes 1.12+. When a list of namespaces are provided through the NAMESPACE environment variable, the setupnamespaces.sh script handles the limitation properly in both the bash and ansible installation.
+{{% notice warning %}}In Kubernetes versions prior to 1.12 (including Openshift up through 3.11), there is a limitation that requires an extra step during installation for PGO to function properly with watched namespaces. This limitation does not exist when using Kubernetes 1.12+. When a list of namespaces are provided through the NAMESPACE environment variable, the setupnamespaces.sh script handles the limitation properly in both the bash and ansible installation.
-However, if the user wishes to add a new watched namespace after installation, where the user would normally use pgo create namespace to add the new namespace, they should instead run the add-targeted-namespace.sh script or they may give themselves cluster-admin privileges instead of having to run setupnamespaces.sh script. Again, this is only required when running on a Kubernetes distribution whose version is below 1.12. In Kubernetes version 1.12+ the pgo create namespace command works as expected.
+However, if the user wishes to add a new watched namespace after installation, where the user would normally use `pgo create namespace` to add the new namespace, they should instead run the add-targeted-namespace.sh script or they may give themselves cluster-admin privileges instead of having to run setupnamespaces.sh script. Again, this is only required when running on a Kubernetes distribution whose version is below 1.12. In Kubernetes version 1.12+ the pgo create namespace command works as expected.
{{% /notice %}}
@@ -83,13 +83,13 @@ Create the Operator namespaces using the Makefile target:
The [Design](/design) section of this documentation talks further about
the use of namespaces within the Operator.
-## Default Installation - Configure Operator Templates
+## Default Installation - Configure PGO Templates
-Within the Operator *conf* directory are several configuration files and templates used by the Operator to determine the various resources that it deploys on your Kubernetes cluster, specifically the PostgreSQL clusters it deploys.
+Within PGO's *conf* directory are several configuration files and templates used by PGO to determine the various resources that it deploys on your Kubernetes cluster, specifically the PostgreSQL clusters it deploys.
-When you install the Operator you must make choices as to what kind of storage the Operator has to work with for example. Storage varies with each installation. As an installer, you would modify these configuration templates used by the Operator to customize its behavior.
+When you install PGO you must make choices as to what kind of storage the Operator has to work with for example. Storage varies with each installation. As an installer, you would modify these configuration templates used by the Operator to customize its behavior.
-**Note**: when you want to make changes to these Operator templates and configuration files after your initial installation, you will need to re-deploy the Operator in order for it to pick up any future configuration changes.
+**Note**: when you want to make changes to these PGO templates and configuration files after your initial installation, you will need to re-deploy the Operator in order for it to pick up any future configuration changes.
Here are some common examples of configuration changes most installers would make:
@@ -110,12 +110,10 @@ Listed above are the *pgo.yaml* sections related to storage choices. *PrimarySt
This sort of configuration allows for a PostgreSQL primary and replica to use different storage if you want. Other storage settings like *AccessMode*, *Size*, *StorageType*, and *StorageClass* further define the storage configuration. Currently, NFS, HostPath, and Storage Classes are supported in the configuration.
-As part of the Operator installation, you will need to adjust these storage settings to suit your deployment requirements. For users wanting to try
+As part of PGO installation, you will need to adjust these storage settings to suit your deployment requirements. For users wanting to try
out the Operator on Google Kubernetes Engine you would make the
following change to the storage configuration in pgo.yaml:
-
-
For NFS Storage, it is assumed that there are sufficient Persistent Volumes (PV) created for the Operator to use when it creates Persistent Volume Claims (PVC). The creation of Persistent Volumes is something a Kubernetes cluster-admin user would typically provide before installing the Operator. There is an example script which can be used to create NFS Persistent Volumes located here:
./pv/create-nfs-pv.sh
@@ -135,11 +133,11 @@ Operator.
Other settings in *pgo.yaml* are described in the [pgo.yaml Configuration](/configuration/pgo-yaml-configuration) section of the documentation.
-## Operator Security
+## PGO Security
-The Operator implements its own RBAC (Role Based Access Controls) for authenticating Operator users access to the Operator REST API.
+PGO implements its own RBAC (Role Based Access Controls) for authenticating Operator users access to the PGO REST API.
-A default admin user is created when the operator is deployed. Create a .pgouser in your home directory and insert the text from below:
+A default admin user is created when PGO is deployed. Create a .pgouser in your home directory and insert the text from below:
```
admin:examplepassword
@@ -157,7 +155,7 @@ To create a unique administrator user on deployment of the operator edit this fi
$PGOROOT/deploy/install-bootstrap-creds.sh
```
-After installation users can create optional Operator users as follows:
+After installation users can create optional PGO users as follows:
```
pgo create pgouser someuser --pgouser-namespaces="pgouser1,pgouser2" --pgouser-password=somepassword --pgouser-roles="somerole,someotherrole"
@@ -166,13 +164,13 @@ pgo create pgouser someuser --pgouser-namespaces="pgouser1,pgouser2" --pgouser-p
Note, you can also store the pgouser file in alternate locations, see the
Security documentation for details.
-Operator security is discussed in the Security section [Security](/security) of the documentation.
+PGO security is further discussed in the section [Security]({{< relref "security/_index.md" >}}) section of the documentation.
Adjust these settings to meet your local requirements.
## Default Installation - Create Kubernetes RBAC Controls
-The Operator installation requires Kubernetes administrators to create Resources required by the Operator. These resources are only allowed to be created by a cluster-admin user. To install on Google Cloud, you will need a user
+PGO installation requires Kubernetes administrators to create Resources required by PGO. These resources are only allowed to be created by a cluster-admin user. To install on Google Cloud, you will need a user
account with cluster-admin privileges. If you own the GKE cluster you
are installing on, you can add cluster-admin role to your account as
follows:
@@ -185,9 +183,9 @@ Tor create the Kubernetes RBAC used by the Operator, run the following as a clus
make installrbac
-This set of Resources is created a single time unless a new Operator
+This set of Resources is created a single time unless a new PGO
release requires these Resources to be recreated. Note that when you
-run *make installrbac* the set of keys used by the Operator REST API and
+run *make installrbac* the set of keys used by the PGO REST API and
also the pgbackrest ssh keys are generated.
Verify the Operator Custom Resource Definitions are created as follows:
@@ -199,14 +197,15 @@ You should see the *pgclusters* CRD among the listed CRD resource types.
See the Security documentation for a description of the various RBAC
resources created and used by the Operator.
-## Default Installation - Deploy the Operator
+## Default Installation - Deploy PGO
+
At this point, you as a normal Kubernetes user should be able to deploy the Operator. To do this, run the following Makefile target:
make deployoperator
-This will cause any existing Operator to be removed first, then the configuration to be bundled into a ConfigMap, then the Operator Deployment to be created.
+This will cause any existing PGO installation to be removed first, then the configuration to be bundled into a ConfigMap, then the Operator Deployment to be created.
-This will create a postgres-operator Deployment and a postgres-operator Service.Operator administrators needing to make changes to the Operator
+This will create a postgres-operator Deployment and a postgres-operator Service.Operator administrators needing to make changes to the PGO
configuration would run this make target to pick up any changes to pgo.yaml,
pgo users/roles, or the Operator templates.
@@ -217,17 +216,20 @@ created using the default installation by running the following:
make cleannamespaces
-This will permanently delete each namespace the Operator installation
+This will permanently delete each namespace the PGO installation
created previously.
-## pgo CLI Installation
-Most users will work with the Operator using the *pgo* CLI tool. That tool is downloaded from the GitHub Releases page for the Operator (https://github.com/crunchydata/postgres-operator/releases). Crunchy Enterprise Customer can download the pgo binaries from https://access.crunchydata.com/ on the downloads page.
+## `pgo` client Installation
-The *pgo* client is provided in Mac, Windows, and Linux binary formats,
+Most users will work with the Operator using the `pgo` client. That tool is downloaded from the GitHub Releases page for the Operator (https://github.com/crunchydata/postgres-operator/releases). Crunchy Data customers can download the `pgo` binaries from https://access.crunchydata.com/ on the downloads page.
+
+The `pgo` client is provided in Mac, Windows, and Linux binary formats,
download the appropriate client to your local laptop or workstation to work
with a remote Operator.
+You can also use the `pgo-client` container.
+
{{% notice info %}}
If TLS authentication was disabled during installation, please see the [TLS Configuration Page] ({{< relref "Configuration/tls.md" >}}) for additional configuration information.
@@ -245,9 +247,9 @@ Prior to using *pgo*, users testing the Operator on a single host can specify th
pgo version
```
-That URL address needs to be reachable from your local *pgo* client host. Your Kubernetes administrator will likely need to create a network route, ingress, or LoadBalancer service to expose the Operator REST API to applications outside of the Kubernetes cluster. Your Kubernetes administrator might also allow you to run the Kubernetes port-forward command, contact your administrator for details.
+That URL address needs to be reachable from your local `pgo` client host. Your Kubernetes administrator will likely need to create a network route, ingress, or LoadBalancer service to expose the PGO REST API to applications outside of the Kubernetes cluster. Your Kubernetes administrator might also allow you to run the Kubernetes port-forward command, contact your administrator for details.
-Next, the *pgo* client needs to reference the keys used to secure the Operator REST API:
+Next, the `pgo` client needs to reference the keys used to secure the PGO REST API:
```
export PGO_CA_CERT=$PGOROOT/conf/postgres-operator/server.crt
@@ -259,7 +261,7 @@ You can also specify these keys on the command line as follows:
pgo version --pgo-ca-cert=$PGOROOT/conf/postgres-operator/server.crt --pgo-client-cert=$PGOROOT/conf/postgres-operator/server.crt --pgo-client-key=$PGOROOT/conf/postgres-operator/server.key
-{{% notice tip %}} if you are running the Operator on Google Cloud, you would open up another terminal and run *kubectl port-forward ...* to forward the Operator pod port 8443 to your localhost where you can access the Operator API from your local workstation.
+{{% notice tip %}} if you are running PGO on Google Cloud, you would open up another terminal and run *kubectl port-forward ...* to forward the Postgres Operator pod port 8443 to your localhost where you can access the PGO API from your local workstation.
{{% /notice %}}
At this point, you can test connectivity between your laptop or workstation and the Postgres Operator deployed on a Kubernetes cluster as follows:
@@ -270,7 +272,7 @@ You should get back a valid response showing the client and server version numbe
## Verify the Installation
-Now that you have deployed the Operator, you can verify that it is running correctly.
+Now that you have deployed PGO, you can verify that it is running correctly.
You should see a pod running that contains the Operator:
@@ -281,10 +283,10 @@ You should see a pod running that contains the Operator:
That pod should show 3 of 3 containers in *running* state and that the operator is installed into the *pgo* namespace.
-The sample environment script, examples/env.sh, if used creates some bash functions that you can use to view the Operator logs. This is useful in case you find one of the Operator containers not in a running status.
+The sample environment script, examples/env.sh, if used creates some bash functions that you can use to view the Postgres Operator logs. This is useful in case you find one of the PGO containers not in a running status.
-Using the pgo CLI, you can verify the versions of the client and server match as follows:
+Using the `pgo` client, you can verify the versions of the client and server match as follows:
pgo version
-This also tests connectivity between your pgo client host and the Operator server.
+This also tests connectivity between your `pgo` client host and Postgres Operator container.
diff --git a/docs/content/installation/other/helm.md b/docs/content/installation/other/helm.md
index a6698cb309..c940cf38c4 100644
--- a/docs/content/installation/other/helm.md
+++ b/docs/content/installation/other/helm.md
@@ -5,12 +5,13 @@ draft: false
weight: 200
---
-# The PostgreSQL Operator Helm Chart
+# PGO: The Postgres Operator Helm Chart
## Overview
-The PostgreSQL Operator comes with a container called `pgo-deployer` which
-handles a variety of lifecycle actions for the PostgreSQL Operator, including:
+PGO, the Postgres Operator from Crunchy Data, comes with a
+container called `pgo-deployer` which handles a variety of
+lifecycle actions for the PostgreSQL Operator, including:
- Installation
- Upgrading
@@ -205,11 +206,11 @@ helm install metrics -n pgo /path/to/metrics/chart_dir
## Upgrade and Uninstall
-Once install has be completed using Helm, it will also be used to upgrade and
+Once install has be completed using Helm, it will also be used to upgrade and
uninstall your PostgreSQL Operator.
{{% notice tip %}}
-The `name` and `namespace` in the following sections should match the options
+The `name` and `namespace` in the following sections should match the options
provided at install.
{{% /notice %}}
@@ -235,7 +236,7 @@ helm uninstall
+
+### 3.3 And the unique visual styling of our website (the "Trade Dress").
+
+This Policy encompasses all Project trademarks and service marks, whether Word Marks, Logos or Trade Dress, which we collectively call the “Marks." We might not have registered some Marks, but this Policy covers our Marks regardless.
+
+## 4. Universal considerations for all uses
+
+Whenever you use a Mark, you must not mislead anyone, either directly or by omission, about what they are getting and from whom. The law reflects this requirement in two major ways described below: it prohibits creating a "likelihood of confusion," but allows for "nominative use."
+
+For example, you cannot say you are distributing PGO software when you're distributing a modified version of it, because you likely would confuse people, since they are not getting the same features and functionality they would get if they downloaded the software from us. You also cannot use our Logo on your website to suggest your website is an official website or we endorse your website.
+
+You can, though, say, for example, you like the PGO software, you are a PGO community participant, you are providing unmodified PGO software, or you wrote a book describing how to use the PGO software.
+
+This fundamental requirement - that it is always clear to people what they are getting and from whom - is reflected throughout this Policy. It should guide you if you are unsure about how you are using the Marks.
+
+In addition:
+
+You may not use the Marks in association with software use or distribution if you don’t comply with the license for the software.
+
+You may not use or register the Marks as part of your own trademark, service mark, domain name, company name, trade name, product name or service name.
+
+Trademark law does not allow you to use names or trademarks that are too similar to ours. You therefore may not use an obvious Mark variant or phonetic equivalent, foreign language equivalent, takeoff, or abbreviation for a similar or compatible product or service.
+
+You will not acquire rights in the Marks, and any goodwill you generate using the Marks inures solely to our benefit.
+## 5. Use for software
+
+See universal considerations for all uses, above, which also apply.
+
+### 5.1 Uses we consider non-infringing
+
+#### 5.1.1 Distributing unmodified source code or unmodified executable code we have compiled
+
+When you redistribute our unmodified software, you are not changing its quality or nature. Therefore, you may retain the Word Marks and Logos we have placed on the software, to identify your redistributed software whether you redistribute by optical media, memory stick or download of unmodified source and executable code. This only applies if you are redistributing official software from this Project that you have not changed. You can find the Logo files [here](/).
+
+#### 5.1.2 Distributing executable code you have compiled, or modified code
+
+You may use the Word Marks, but not the Logos, to describe the software’s origin, that is, that the code you are distributing is a modification of our software. You may say, for example, "this software is derived from the source code from the PGO Project."
+Of course, you can place your own trademarks or logos on software to which you have made substantive modifications, because by modifying the software, you have become the origin of the modified software.
+
+#### 5.1.3 Statements about compatibility, interoperability or derivation
+
+You may use the Word Marks, but not the Logos, to describe the relationship between your software and ours. You should use Our Mark after a verb or preposition that describes that relationship. So, you may say, for example, "Bob's plug-in for PGO," but may not say "Bob's PGO plug-in."
+
+#### 5.1.4 Using trademarks to show community affiliation
+
+This section discusses using our Marks for application themes, skins and personas. We discuss using our Marks on websites below.
+You may use the Word Marks and the Logos in themes, personas, or skins to show your Project support, provided the use is non-commercial and clearly decorative, as contrasted with a use that appears to be the branding for a website or application.
+
+### 5.2 Permitted uses
+
+#### 5.2.1 Distributing unmodified software
+
+You may use the Word Marks and Logos to distribute executable code if you make the code from official Project source code using the procedure for creating an executable found at [https://access.crunchydata.com/documentation/postgres-operator/latest/installation/](https://access.crunchydata.com/documentation/postgres-operator/latest/installation/).
+
+#### 5.3 Unpermitted uses we consider infringing
+
+We will likely consider it an infringement to use the Marks in software that combines our software with another software program. In addition to creating a single executable for both software programs, we would consider your software "combined" with ours if installing our software automatically installs yours. We would not consider your software "combined" with ours if it is on the same media but requires separate, independent action to install.
+
+## 6. Use for non-software goods and services
+
+See universal considerations for all uses, above, which also apply.
+
+### 6.1 Uses we consider non-infringing
+
+#### 6.1.1 Websites
+
+You may use the Word Marks and Logos on your webpage to show your Project support if:
+
+- Your own branding or naming is more prominent than any Project Marks;
+- The Logos hyperlink to the Project website: [https://github.com/CrunchyData/postgres-operator](https://github.com/CrunchyData/postgres-operator);
+- The site does not mislead customers into thinking your website, service, or product is our website, service, or product; and
+- The site clearly states the Project does not affiliate with or endorse you.
+
+#### 6.1.2 Publishing and presenting
+
+You can use the Word Marks in book and article titles, and the Logo in illustrations within a document, if the use does not suggest we published, endorse, or agree with your work.
+
+#### 6.1.3 Events
+
+You can use the Logo to promote the software and Project at events.
+
+### 6.2 Permitted uses
+
+#### 6.2.1 Meetups and user groups
+
+You can use the Word Marks as part of your meetup or user group name if:
+
+- The group’s main focus is the software;
+- Any software or services the group provides are without cost;
+- The group does not make a profit;
+- Any charge to attend meetings is only to cover the cost of the venue, food and drink.
+
+The universal considerations for all uses, above, still apply: specifically, you may not use or register the Marks as part of your own trademark, service mark, domain name, company name, trade name, product name or service name.
+
+### 6.3 Unpermitted uses we consider infringing
+
+We will likely consider it an infringement to use the Marks as part of a domain name or subdomain.
+We also would likely consider it an infringement to use the Marks on for-sale promotional goods.
+
+## 7 General Information
+
+### 7.1 Trademark legends
+
+If you are using our Marks in a way described in the sections entitled "Permitted uses," put the following notice at the foot of the page where you have used the Mark (or, if in a book, on the credits page), on packaging or labeling, and on advertising or marketing materials: "The PGO Project is a trademark of Crunchy Data Solutions, Inc., used with permission."
+
+### 7.2 What to do when you see abuse
+
+If you are aware of a confusing use or misuse of the Marks, we would appreciate you bringing it to our attention. Please contact us at [trademarks@crunchydata.com](mailto:trademarks@crunchydata.com) so we can investigate it further.
+
+### 7.3 Where to get further information
+
+If you have questions, wish to speak about using our Marks in ways the Policy doesn’t address, or see abuse of our Marks, please send an email to [trademarks@crunchydata.com](mailto:trademarks@crunchydata.com).
+
+We based these guidelines on the Model Trademark Guidelines, available at [http://www.modeltrademarkguidelines.org](http://www.modeltrademarkguidelines.org), used under a Creative Commons Attribution 3.0 Unported license: [https://creativecommons.org/licenses/by/3.0/deed.en_US](https://creativecommons.org/licenses/by/3.0/deed.en_US).
diff --git a/docs/static/logos/pgo.png b/docs/static/logos/pgo.png
new file mode 100644
index 0000000000..9d38c8f859
Binary files /dev/null and b/docs/static/logos/pgo.png differ
diff --git a/docs/static/logos/pgo.svg b/docs/static/logos/pgo.svg
new file mode 100644
index 0000000000..d72f9d7810
--- /dev/null
+++ b/docs/static/logos/pgo.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/examples/create-by-resource/fromcrd.json b/examples/create-by-resource/fromcrd.json
index 209401d9b6..f93a7bd406 100644
--- a/examples/create-by-resource/fromcrd.json
+++ b/examples/create-by-resource/fromcrd.json
@@ -16,7 +16,7 @@
"pg-cluster": "fromcrd",
"pg-pod-anti-affinity": "",
"pgo-backrest": "true",
- "pgo-version": "4.4.0",
+ "pgo-version": "4.4.3",
"pgouser": "pgoadmin",
"primary": "true"
},
@@ -62,7 +62,7 @@
},
"backrestResources": {},
"ccpimage": "crunchy-postgres-ha",
- "ccpimagetag": "centos7-12.3-4.4.0",
+ "ccpimagetag": "centos7-12.6-4.4.3",
"clustername": "fromcrd",
"customconfig": "",
"database": "userdb",
@@ -95,7 +95,7 @@
"userlabels": {
"crunchy_collect": "false",
"pg-pod-anti-affinity": "",
- "pgo-version": "4.4.0",
+ "pgo-version": "4.4.3",
"pgouser": "pgoadmin",
"pgo-backrest": "true"
},
diff --git a/examples/create-by-resource/run.sh b/examples/create-by-resource/run.sh
index 1cdefdda77..f5e0cd5d58 100755
--- a/examples/create-by-resource/run.sh
+++ b/examples/create-by-resource/run.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2019 - 2020 Crunchy Data Solutions, Inc.
+# Copyright 2019 - 2021 Crunchy Data Solutions, Inc.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
@@ -18,6 +18,8 @@
#########
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+# PGO_CMD should either be "kubectl" or "oc" -- defaulting to kubectl
+PGO_CMD=${PGO_CMD:-kubectl}
# A namespace that exists in NAMESPACE env var - see examples/envs.sh
export NS=pgouser1
diff --git a/examples/custom-config/create.sh b/examples/custom-config/create.sh
index b0599f1b37..5900132568 100755
--- a/examples/custom-config/create.sh
+++ b/examples/custom-config/create.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2018 - 2020 Crunchy Data Solutions, Inc.
+# Copyright 2018 - 2021 Crunchy Data Solutions, Inc.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
@@ -28,11 +28,8 @@ function echo_info() {
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-#Error if PGO_CMD not set
-if [[ -z ${PGO_CMD} ]]
-then
- echo_err "PGO_CMD is not set."
-fi
+# PGO_CMD should either be "kubectl" or "oc" -- defaulting to kubectl
+PGO_CMD=${PGO_CMD:-kubectl}
#Error is PGO_NAMESPACE not set
if [[ -z ${PGO_NAMESPACE} ]]
diff --git a/examples/custom-config/setup.sql b/examples/custom-config/setup.sql
index 206005eb8a..1a05bce487 100644
--- a/examples/custom-config/setup.sql
+++ b/examples/custom-config/setup.sql
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 - 2020 Crunchy Data Solutions, Inc.
+ * Copyright 2017 - 2021 Crunchy Data Solutions, Inc.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
diff --git a/examples/envs.sh b/examples/envs.sh
index e9a612077c..e303713464 100644
--- a/examples/envs.sh
+++ b/examples/envs.sh
@@ -20,7 +20,7 @@ export PGOROOT=$GOPATH/src/github.com/crunchydata/postgres-operator
# the version of the Operator you run is set by these vars
export PGO_IMAGE_PREFIX=registry.developers.crunchydata.com/crunchydata
export PGO_BASEOS=centos7
-export PGO_VERSION=4.4.0
+export PGO_VERSION=4.4.3
export PGO_IMAGE_TAG=$PGO_BASEOS-$PGO_VERSION
# for setting the pgo apiserver port, disabling TLS or not verifying TLS
diff --git a/examples/load/sample-json-load-config-sc.yaml b/examples/load/sample-json-load-config-sc.yaml
index b69fe846d3..255f5d857c 100644
--- a/examples/load/sample-json-load-config-sc.yaml
+++ b/examples/load/sample-json-load-config-sc.yaml
@@ -1,5 +1,5 @@
PGOImagePrefix: registry.developers.crunchydata.com/crunchydata
-PGOImageTag: centos7-4.4.0
+PGOImageTag: centos7-4.4.3
DbDatabase: userdb
DbUser: postgres
DbPort: 5432
diff --git a/examples/load/sample-json-load-config.yaml b/examples/load/sample-json-load-config.yaml
index 530d176958..a29a9ffb9e 100644
--- a/examples/load/sample-json-load-config.yaml
+++ b/examples/load/sample-json-load-config.yaml
@@ -1,5 +1,5 @@
PGOImagePrefix: registry.developers.crunchydata.com/crunchydata
-PGOImageTag: centos7-4.4.0
+PGOImageTag: centos7-4.4.3
DbDatabase: userdb
DbUser: postgres
DbPort: 5432
diff --git a/examples/load/sample-load-config.yaml b/examples/load/sample-load-config.yaml
index 34016c35eb..291dc2e1bd 100644
--- a/examples/load/sample-load-config.yaml
+++ b/examples/load/sample-load-config.yaml
@@ -1,5 +1,5 @@
PGOImagePrefix: registry.developers.crunchydata.com/crunchydata
-PGOImageTag: centos7-4.4.0
+PGOImageTag: centos7-4.4.3
DbDatabase: userdb
DbUser: postgres
DbPort: 5432
diff --git a/hack/boilerplate.go.txt b/hack/boilerplate.go.txt
index 8aabc9a12b..e681957476 100644
--- a/hack/boilerplate.go.txt
+++ b/hack/boilerplate.go.txt
@@ -1,5 +1,5 @@
/*
-Copyright 2020 Crunchy Data Solutions, Inc.
+Copyright 2020 - 2021 Crunchy Data Solutions, Inc.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
diff --git a/hack/config_sync.sh b/hack/config_sync.sh
new file mode 100755
index 0000000000..06f8ec1498
--- /dev/null
+++ b/hack/config_sync.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+# Copyright 2020 - 2021 Crunchy Data Solutions, Inc.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+test="${PGOROOT:?Need to set PGOROOT env variable}"
+
+INSTALLER_DIR="$PGOROOT/installers"
+MASTER_CONFIG="$PGOROOT/installers/ansible/values.yaml"
+
+yq write --inplace --doc 2 "$INSTALLER_DIR/kubectl/postgres-operator.yml" 'data"values.yaml"' -- "$(cat $MASTER_CONFIG)"
+yq write --inplace --doc 2 "$INSTALLER_DIR/kubectl/postgres-operator-ocp311.yml" 'data"values.yaml"' -- "$(cat $MASTER_CONFIG)"
+
+cat "$INSTALLER_DIR/helm/postgres-operator/helm_template.yaml" "$MASTER_CONFIG" > "$INSTALLER_DIR/helm/postgres-operator/values.yaml"
diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh
index c9795398ae..97fb0aa383 100755
--- a/hack/update-codegen.sh
+++ b/hack/update-codegen.sh
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
-# Copyright 2020 Crunchy Data Solutions, Inc.
+# Copyright 2020 - 2021 Crunchy Data Solutions, Inc.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
diff --git a/hack/verify-codegen.sh b/hack/verify-codegen.sh
index c096654ca9..27eccb0eb1 100755
--- a/hack/verify-codegen.sh
+++ b/hack/verify-codegen.sh
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
-# Copyright 2020 Crunchy Data Solutions, Inc.
+# Copyright 2020 - 2021 Crunchy Data Solutions, Inc.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
diff --git a/installers/ansible/README.md b/installers/ansible/README.md
index 6f0464914b..e94a083ebc 100644
--- a/installers/ansible/README.md
+++ b/installers/ansible/README.md
@@ -1,15 +1,15 @@
-# Crunchy Data PostgreSQL Operator Playbook
+# PGO: Postgres Operator Playbook
- 
+ 