Skip to content

Commit

Permalink
updated postgres versions and operator version
Browse files Browse the repository at this point in the history
  • Loading branch information
vagrant authored and andrewlecuyer committed Aug 31, 2021
1 parent 8e7feb2 commit 49a10f3
Show file tree
Hide file tree
Showing 31 changed files with 45 additions and 45 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ endif
# Default values if not already set
CCP_BASEOS ?= centos7
CCP_PGVERSION ?= 12
CCP_PG_FULLVERSION ?= 12.7
CCP_PG_FULLVERSION ?= 12.8
CCP_PATRONI_VERSION ?= 2.0.2
CCP_BACKREST_VERSION ?= 2.29
CCP_VERSION ?= 4.5.3
CCP_VERSION ?= 4.5.4-rc.1
CCP_POSTGIS_VERSION ?= 3.0
PACKAGER ?= yum

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ The following features are supported and required by the crunchy-backrest-restor

The crunchy-backrest-restore Docker image contains the following packages (versions vary depending on PostgreSQL version):

* PostgreSQL (13.3, 12.7, 11.12, 10.17, and 9.6.22)
* PostgreSQL (13.4, 12.8, 11.13, 10.18, and 9.6.23)
* [pgBackRest](https://pgbackrest.org/) (2.29)
* CentOS 7, CentOS 8 - publicly available
* UBI 7, UBI 8 - customers only
Expand Down
2 changes: 1 addition & 1 deletion docs/content/container-specifications/crunchy-backup.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ The following features are supported by the `crunchy-backup` container:

The crunchy-backup Docker image contains the following packages (versions vary depending on PostgreSQL version):

* PostgreSQL (13.3, 12.7, 11.12, 10.17, and 9.6.22)
* PostgreSQL (13.4, 12.8, 11.13, 10.18, and 9.6.23)
* CentOS 7, CentOS 8 - publicly available
* UBI 7, UBI 8 - customers only

Expand Down
2 changes: 1 addition & 1 deletion docs/content/container-specifications/crunchy-pgadmin4.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ The following features are supported by the crunchy-pgadmin4 container:

The crunchy-pgadmin4 Docker image contains the following packages (versions vary depending on PostgreSQL version):

* PostgreSQL (13.3, 12.7, 11.12, 10.17, and 9.6.22)
* PostgreSQL (13.4, 12.8, 11.13, 10.18, and 9.6.23)
* [pgAdmin4](https://www.pgadmin.org/)
* CentOS 7, CentOS 8 - publicly available
* UBI 7, UBI 8 - customers only
Expand Down
2 changes: 1 addition & 1 deletion docs/content/container-specifications/crunchy-pgbench.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ The following features are supported by the `crunchy-pgbench` container:

The crunchy-pgbench Docker image contains the following packages (versions vary depending on PostgreSQL version):

* pgBench (13.3, 12.7, 11.12, 10.17, and 9.6.22)
* pgBench (13.4, 12.8, 11.13, 10.18, and 9.6.23)
* CentOS 7, CentOS 8 - publicly available
* UBI 7, UBI 8 - customers only

Expand Down
2 changes: 1 addition & 1 deletion docs/content/container-specifications/crunchy-pgbouncer.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ The following features are supported by the crunchy-pgbouncer container:

The crunchy-pgbouncer Docker image contains the following packages (versions vary depending on PostgreSQL version):

* PostgreSQL (13.3, 12.7, 11.12, 10.17, and 9.6.22)
* PostgreSQL (13.4, 12.8, 11.13, 10.18, and 9.6.23)
* [pgBouncer](https://pgbouncer.github.io/)
* CentOS 7, CentOS 8 - publicly available
* UBI 7, UBI 8 - customers only
Expand Down
2 changes: 1 addition & 1 deletion docs/content/container-specifications/crunchy-pgdump.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ PostgreSQL database.

The crunchy-pgdump Docker image contains the following packages (versions vary depending on PostgreSQL version):

* PostgreSQL (13.3, 12.7, 11.12, 10.17, and 9.6.22)
* PostgreSQL (13.4, 12.8, 11.13, 10.18, and 9.6.23)
* CentOS 7, CentOS 8 - publicly available
* UBI 7, UBI 8 - customers only

Expand Down
2 changes: 1 addition & 1 deletion docs/content/container-specifications/crunchy-pgpool.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ The following features are supported by the `crunchy-postgres` container:

The crunchy-pgpool Docker image contains the following packages (versions vary depending on PostgreSQL version):

* PostgreSQL (13.3, 12.7, 11.12, 10.17, and 9.6.22)
* PostgreSQL (13.4, 12.8, 11.13, 10.18, and 9.6.23)
* [pgPool II](http://www.pgpool.net/mediawiki/index.php/Main_Page)
* CentOS 7, CentOS 8 - publicly available
* UBI 7, UBI 8 - customers only
Expand Down
2 changes: 1 addition & 1 deletion docs/content/container-specifications/crunchy-pgrestore.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ to a PostgreSQL container database.

The crunchy-pgrestore Docker image contains the following packages (versions vary depending on PostgreSQL version):

* PostgreSQL (13.3, 12.7, 11.12, 10.17, and 9.6.22)
* PostgreSQL (13.4, 12.8, 11.13, 10.18, and 9.6.23)
* CentOS 7, CentOS 8 - publicly available
* UBI 7, UBI 8 - customers only

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ The following features are supported by the `crunchy-postgres-gis` container:

The crunchy-postgres-gis Docker image contains the following packages (versions vary depending on PostgreSQL version):

* PostgreSQL (13.3, 12.7, 11.12, 10.17, and 9.6.22)
* PostgreSQL (13.4, 12.8, 11.13, 10.18, and 9.6.23)
* [pgBackRest](https://pgbackrest.org/) (2.29)
* CentOS 7, CentOS 8 - publicly available
* UBI 7, UBI 8 - customers only
Expand Down
2 changes: 1 addition & 1 deletion docs/content/container-specifications/crunchy-postgres.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ The following features are supported by the `crunchy-postgres` container:

The crunchy-postgres Docker image contains the following packages (versions vary depending on PostgreSQL version):

* PostgreSQL (13.3, 12.7, 11.12, 10.17, and 9.6.22)
* PostgreSQL (13.4, 12.8, 11.13, 10.18, and 9.6.23)
* [pgBackRest](https://pgbackrest.org/) (2.29)
* CentOS 7, CentOS 8 - publicly available
* UBI 7, UBI 8 - customers only
Expand Down
2 changes: 1 addition & 1 deletion docs/content/container-specifications/crunchy-upgrade.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ The following features are supported by the crunchy-upgrade container:

The crunchy-upgrade Docker image contains the following packages (versions vary depending on PostgreSQL version):

* PostgreSQL (13.3, 12.7, 11.12, 10.17, and 9.6.22)
* PostgreSQL (13.4, 12.8, 11.13, 10.18, and 9.6.23)
* CentOS 7, CentOS 8 - publicly available
* UBI 7, UBI 8 - customers only

Expand Down
8 changes: 4 additions & 4 deletions docs/content/contributing/building.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ export GOBIN=$GOPATH/bin # set bin path
export PATH=$PATH:$GOBIN # add Go bin path to your overall path
export CCP_BASEOS=centos7 # centos7 for Centos, ubi7 for Red Hat Universal Base Image
export CCP_PGVERSION=12 # The PostgreSQL major version
export CCP_PG_FULLVERSION=12.7
export CCP_PG_FULLVERSION=12.8
export CCP_POSTGIS_VERSION=3.0
export CCP_VERSION=4.5.3
export CCP_VERSION=4.5.4-rc.1
export CCP_IMAGE_PREFIX=crunchydata # Prefix to put before all the container image names
export CCP_IMAGE_TAG=$CCP_BASEOS-$CCP_PG_FULLVERSION-$CCP_VERSION # Used to tag the images
export CCP_POSTGIS_IMAGE_TAG=$CCP_BASEOS-$CCP_PG_FULLVERSION-$CCP_POSTGIS_VERSION-$CCP_VERSION # Used to tag images that include PostGIS
Expand All @@ -69,9 +69,9 @@ export GOBIN=$GOPATH/bin
export PATH=$PATH:$GOBIN
export CCP_BASEOS=centos7
export CCP_PGVERSION=12
export CCP_PG_FULLVERSION=12.7
export CCP_PG_FULLVERSION=12.8
export CCP_POSTGIS_VERSION=3.0
export CCP_VERSION=4.5.3
export CCP_VERSION=4.5.4-rc.1
export CCP_IMAGE_PREFIX=crunchydata
export CCP_IMAGE_TAG=$CCP_BASEOS-$CCP_PG_FULLVERSION-$CCP_VERSION
export CCP_POSTGIS_IMAGE_TAG=$CCP_BASEOS-$CCP_PG_FULLVERSION-$CCP_POSTGIS_VERSION-$CCP_VERSION
Expand Down
4 changes: 2 additions & 2 deletions docs/content/examples/administration/upgrade.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ weight: 81

{{% notice tip %}}
This example assumes you have run *primary* using a PostgreSQL 11 or 12 image
such as `centos7-12.7-4.5.3` prior to running this upgrade.
such as `centos7-12.8-4.5.4-rc.1` prior to running this upgrade.
{{% /notice %}}

The upgrade container will let you perform a `pg_upgrade` from a PostgreSQL version 9.5, 9.6, 10, 11 or 12 database to the available any of the higher versions of PostgreSQL versions that are currently support which are 9.6, 10, 11, and 12. It does not do multi-version upgrades so you will need to for example do a 10 to 11 and then a 11 to 12 to get to version 12.

Prior to running this example, make sure your `CCP_IMAGE_TAG`
environment variable is using the next major version of PostgreSQL that you
want to upgrade to. For example, if you're upgrading from 11 to 12, make
sure the variable references a PostgreSQL 12 image such as `centos7-12.7-4.5.3`.
sure the variable references a PostgreSQL 12 image such as `centos7-12.8-4.5.4-rc.1`.

This will create the following in your Kubernetes environment:

Expand Down
6 changes: 3 additions & 3 deletions docs/content/examples/postgresql/custom-config-ssl.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@ For instance, if your service has an address as follows:
```
${CCP_CLI} get service
NAME CLUSTER-IP EXTERNAL-IP PORT(S) AGE
custom-config-ssl 172.30.211.128 <none> 5432/TCP
custom-config-ssl 172.30.211.138 <none> 5432/TCP
```

Then your `/etc/hosts` file needs an entry like this:
```
172.30.211.128 custom-config-ssl
172.30.211.138 custom-config-ssl
```

For production Kubernetes and OpenShift installations, it will likely be preferred for DNS
Expand Down Expand Up @@ -83,7 +83,7 @@ sslkey=$CCPROOT/examples/kube/custom-config-ssl/certs/client.key"

You should see a connection that looks like the following:
```
psql (11.12)
psql (11.13)
SSL connection (protocol: TLSv1.2, cipher: ECDHE-RSA-AES256-GCM-SHA384, bits: 256, compression: off)
Type "help" for help.
Expand Down
6 changes: 3 additions & 3 deletions docs/content/installation-guide/installation-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ Make directories to hold the GitHub clone that also work with the Go workspace s
$ cd $HOME/cdev/src/github.com/crunchydata
$ git clone https://github.com/crunchydata/crunchy-containers
$ cd crunchy-containers
$ git checkout v4.5.3
$ git checkout v4.5.4-rc.1

# Your Shell Environment

Expand All @@ -91,9 +91,9 @@ line starting with #:
export PATH=$PATH:$GOBIN # add Go bin path to your overall path
export CCP_BASEOS=centos7 # centos7 for Centos, ubi7 for Red Hat Universal Base Image
export CCP_PGVERSION=12 # The PostgreSQL major version
export CCP_PG_FULLVERSION=12.7
export CCP_PG_FULLVERSION=12.8
export CCP_POSTGIS_VERSION=3.0 # The PostGIS version
export CCP_VERSION=4.5.3
export CCP_VERSION=4.5.4-rc.1
export CCP_IMAGE_PREFIX=crunchydata # Prefix to put before all the container image names
export CCP_IMAGE_TAG=$CCP_BASEOS-$CCP_PG_FULLVERSION-$CCP_VERSION # Used to tag the images
export CCP_POSTGIS_IMAGE_TAG=$CCP_BASEOS-$CCP_PG_FULLVERSION-$CCP_POSTGIS_VERSION-$CCP_VERSION # Used to tag images that include PostGIS
Expand Down
4 changes: 2 additions & 2 deletions examples/docker/swarm-service/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version: "3.3"
services:
primary:
hostname: 'primary'
image: crunchydata/crunchy-postgres:centos7-11.12-4.5.3
image: crunchydata/crunchy-postgres:centos7-11.13-4.5.4-rc.1
environment:
- PGHOST=/tmp
- MAX_CONNECTIONS=10
Expand All @@ -29,7 +29,7 @@ services:
- node.labels.type == primary
- node.role == worker
replica:
image: crunchydata/crunchy-postgres:centos7-11.12-4.5.3
image: crunchydata/crunchy-postgres:centos7-11.13-4.5.4-rc.1
environment:
- PGHOST=/tmp
- MAX_CONNECTIONS=10
Expand Down
2 changes: 1 addition & 1 deletion examples/helm/custom-config/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v1
name: custom-config
description: Deploys a basic single PostgreSQL primary database with custom configurations.
version: 1
appVersion: 4.5.3
appVersion: 4.5.4-rc.1
keywords:
- postgresql
- postgres
Expand Down
4 changes: 2 additions & 2 deletions examples/helm/custom-config/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ $ helm install custom-config --name custom-config \
--set Image.tag=centos7-9.6.11-2.2.0
```

The above command changes the image tag of the container to of `centos7-11.12-4.5.3`.
The above command changes the image tag of the container to of `centos7-11.13-4.5.4-rc.1`.

> **Tip**: You can use the default [values.yaml](values.yaml)
Expand All @@ -84,7 +84,7 @@ The above command changes the image tag of the container to of `centos7-11.12-4.
| `.serviceType` | The type of service | `ClusterIP`
| `.image.repository` | The repository on DockerHub where the images are found. | `crunchydata` |
| `.image.container` | The container to be pulled from the repository. | `crunchy-postgres` |
| `.image.tag` | The image tag to be used. | `centos7-11.12-4.5.3` |
| `.image.tag` | The image tag to be used. | `centos7-11.13-4.5.4-rc.1` |
| `.resources.cpu` | Defines a limit for CPU | `200m` |
| `.resources.memory` | Defines a limit for memory | `512Mi` |

Expand Down
2 changes: 1 addition & 1 deletion examples/helm/custom-config/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ serviceType: ClusterIP
image:
repository: crunchydata
container: crunchy-postgres
tag: centos7-11.12-4.5.3
tag: centos7-11.13-4.5.4-rc.1
resources:
cpu: 200m
memory: 512Mi
Expand Down
2 changes: 1 addition & 1 deletion examples/helm/primary-replica/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v1
name: primary-replica
description: Deploy a basic crunchy primary and replica cluster
version: 1
appVersion: 4.5.3
appVersion: 4.5.4-rc.1
keywords:
- postgresql
- postgres
Expand Down
4 changes: 2 additions & 2 deletions examples/helm/primary-replica/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ $ helm install primary-replica --name primary-replica \
--set Image.tag=centos7-9.6.11-2.2.0
```

The above command changes the image tag of the container to `centos7-11.12-4.5.3`.
The above command changes the image tag of the container to `centos7-11.13-4.5.4-rc.1`.

> **Tip**: You can use the default [values.yaml](values.yaml)
Expand All @@ -121,7 +121,7 @@ The above command changes the image tag of the container to `centos7-11.12-4.5.3
| `.serviceType` | The type of service | `ClusterIP`
| `.image.repository` | The repository on DockerHub where the images are found. | `crunchydata` |
| `.image.container` | The container to be pulled from the repository. | `crunchy-postgres` |
| `.image.tag` | The image tag to be used. | `centos7-11.12-4.5.3` |
| `.image.tag` | The image tag to be used. | `centos7-11.13-4.5.4-rc.1` |
| `.pv.storage` | Size of persistent volume | 400M |
| `.pv.name` | Name of persistent volume | `primary-pv` |
| `.pv.mode` | The storage mode for the persistent volume | `ReadWriteMany` |
Expand Down
2 changes: 1 addition & 1 deletion examples/helm/primary-replica/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ serviceType: ClusterIP
image:
repository: crunchydata
container: crunchy-postgres
tag: centos7-11.12-4.5.3
tag: centos7-11.13-4.5.4-rc.1
pv:
storage: 400M
name: primary-pv
Expand Down
2 changes: 1 addition & 1 deletion examples/helm/primary/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v1
name: basic
description: Deploys a single PostgreSQL primary database
version: 1
appVersion: 4.5.3
appVersion: 4.5.4-rc.1
keywords:
- postgresql
- postgres
Expand Down
4 changes: 2 additions & 2 deletions examples/helm/primary/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ $ helm install primary --name primary \
--set Image.tag=centos7-9.6.11-2.2.0
```

The above command changes the image tag of the container from the default of `centos7-11.12-4.5.3` to `centos7-9.6.11-2.2.0`.
The above command changes the image tag of the container from the default of `centos7-11.13-4.5.4-rc.1` to `centos7-9.6.11-2.2.0`.

> **Tip**: You can use the default [values.yaml](values.yaml)
Expand All @@ -83,7 +83,7 @@ The above command changes the image tag of the container from the default of `ce
| `.serviceType` | The type of service | `ClusterIP`
| `.image.repository` | The repository on DockerHub where the images are found. | `crunchydata` |
| `.image.container` | The container to be pulled from the repository. | `crunchy-postgres` |
| `.image.tag` | The image tag to be used. | `centos7-11.12-4.5.3` |
| `.image.tag` | The image tag to be used. | `centos7-11.13-4.5.4-rc.1` |
| `.resources.cpu` | Defines a limit for CPU | `200m` |
| `.resources.memory` | Defines a limit for memory | `512Mi` |

Expand Down
2 changes: 1 addition & 1 deletion examples/helm/primary/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ serviceType: ClusterIP
image:
repository: crunchydata
container: crunchy-postgres
tag: centos7-11.12-4.5.3
tag: centos7-11.13-4.5.4-rc.1
resources:
cpu: 200m
memory: 512Mi
2 changes: 1 addition & 1 deletion examples/helm/template-small/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v1
name: template-small
description: The Crunchy template-small configuration includes a single primary with limited CPU and memory, suitable for development purposes.
version: 1
appVersion: 4.5.3
appVersion: 4.5.4-rc.1
keywords:
- postgresql
- postgres
Expand Down
4 changes: 2 additions & 2 deletions examples/helm/template-small/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ $ helm install template-small --name template-small \
--set Image.tag=centos7-9.6.11-2.2.0
```

The above command changes the image tag of the container from the default of `centos7-11.12-4.5.3` to `centos7-9.6.11-2.2.0`.
The above command changes the image tag of the container from the default of `centos7-11.13-4.5.4-rc.1` to `centos7-9.6.11-2.2.0`.

> **Tip**: You can use the default [values.yaml](values.yaml)
Expand All @@ -93,7 +93,7 @@ The above command changes the image tag of the container from the default of `ce
| `.serviceType` | The type of service | `ClusterIP`
| `.image.repository` | The repository on DockerHub where the images are found. | `crunchydata` |
| `.image.container` | The container to be pulled from the repository. | `crunchy-postgres` |
| `.image.tag` | The image tag to be used. | `centos7-11.12-4.5.3` |
| `.image.tag` | The image tag to be used. | `centos7-11.13-4.5.4-rc.1` |
| `.resources.cpu` | Defines a limit for CPU | `200m` |
| `.resources.memory` | Defines a limit for memory | `512Mi` |

Expand Down
2 changes: 1 addition & 1 deletion examples/helm/template-small/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ serviceType: ClusterIP
image:
repository: crunchydata
container: crunchy-postgres
tag: centos7-11.12-4.5.3
tag: centos7-11.13-4.5.4-rc.1
resources:
cpu: 200m
memory: 512Mi
Expand Down
2 changes: 1 addition & 1 deletion redhat/atomic/help.1
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,4 @@ The Red Hat Enterprise Linux version from which the container was built. For exa
\fB\fCRelease=\fR

.PP
The specific release number of the container. For example, Release="4.5.3"
The specific release number of the container. For example, Release="4.5.4-rc.1"
2 changes: 1 addition & 1 deletion redhat/atomic/help.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ The Red Hat Enterprise Linux version from which the container was built. For exa

`Release=`

The specific release number of the container. For example, Release="4.5.3"
The specific release number of the container. For example, Release="4.5.4-rc.1"

0 comments on commit 49a10f3

Please sign in to comment.