Version bump v4.7.0

Jonathan S. Katz · Jonathan S. Katz · commit d5bcfeee4ffe · 2021-05-17T10:25:45.000-04:00
diff --git a/Makefile b/Makefile
@@ -9,7 +9,7 @@ CCP_PGVERSION ?= 13
 CCP_PG_FULLVERSION ?= 13.3
 CCP_PATRONI_VERSION ?= 2.0.2
 CCP_BACKREST_VERSION ?= 2.33
-CCP_VERSION ?= 4.7.0-rc.1
+CCP_VERSION ?= 4.7.0
 CCP_POSTGIS_VERSION ?= 3.1
 PACKAGER ?= yum
 
diff --git a/docs/content/contributing/building.md b/docs/content/contributing/building.md
@@ -52,7 +52,7 @@ export CCP_BASEOS=centos8       # centos8 for CentOS, ubi8 for Red Hat Universal
 export CCP_PGVERSION=12        # The PostgreSQL major version
 export CCP_PG_FULLVERSION=13.3
 export CCP_POSTGIS_VERSION=3.1
-export CCP_VERSION=4.7.0-rc.1
+export CCP_VERSION=4.7.0
 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
@@ -71,7 +71,7 @@ export CCP_BASEOS=centos8
 export CCP_PGVERSION=12
 export CCP_PG_FULLVERSION=13.3
 export CCP_POSTGIS_VERSION=3.1
-export CCP_VERSION=4.7.0-rc.1
+export CCP_VERSION=4.7.0
 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
diff --git a/docs/content/examples/administration/upgrade.md b/docs/content/examples/administration/upgrade.md
@@ -9,15 +9,15 @@ weight: 81
 
 {{% notice tip %}}
 This example assumes you have run *primary* using a PostgreSQL 12 or 13 image
-such as `centos8-13.3-4.7.0-rc.1` prior to running this upgrade.
+such as `centos8-13.3-4.7.0` 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, 12, or 13 database to the available any of the higher versions of PostgreSQL versions that are currently support which are 9.6, 10, 11, 12, and 13. 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 12 to 13, make
-sure the variable references a PostgreSQL 13 image such as `centos8-13.3-4.7.0-rc.1`.
+sure the variable references a PostgreSQL 13 image such as `centos8-13.3-4.7.0`.
 
 This will create the following in your Kubernetes environment:
 
diff --git a/docs/content/installation-guide/installation-guide.md b/docs/content/installation-guide/installation-guide.md
@@ -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.7.0-rc.1
+    $ git checkout v4.7.0
 
 # Your Shell Environment
 
@@ -93,7 +93,7 @@ line starting with #:
     export CCP_PGVERSION=12         # The PostgreSQL major version
     export CCP_PG_FULLVERSION=13.3
     export CCP_POSTGIS_VERSION=3.1  # The PostGIS version
-    export CCP_VERSION=4.7.0-rc.1
+    export CCP_VERSION=4.7.0
     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
diff --git a/examples/docker/swarm-service/docker-compose.yml b/examples/docker/swarm-service/docker-compose.yml
@@ -4,7 +4,7 @@ version: "3.3"
 services:
   primary:
     hostname: 'primary'
-    image: crunchydata/crunchy-postgres:centos8-13.3-4.7.0-rc.1
+    image: crunchydata/crunchy-postgres:centos8-13.3-4.7.0
     environment:
     - PGHOST=/tmp
     - MAX_CONNECTIONS=10
@@ -29,7 +29,7 @@ services:
         - node.labels.type == primary
         - node.role == worker
   replica:
-    image: crunchydata/crunchy-postgres:centos8-13.3-4.7.0-rc.1
+    image: crunchydata/crunchy-postgres:centos8-13.3-4.7.0
     environment:
     - PGHOST=/tmp
     - MAX_CONNECTIONS=10
diff --git a/examples/helm/custom-config/Chart.yaml b/examples/helm/custom-config/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 name: custom-config
 description: Deploys a basic single PostgreSQL primary database with custom configurations.
 version: 1
-appVersion: 4.7.0-rc.1
+appVersion: 4.7.0
 keywords:
 - postgresql
 - postgres
diff --git a/examples/helm/custom-config/README.md b/examples/helm/custom-config/README.md
@@ -66,10 +66,10 @@ See `values.yaml` for configuration notes. Specify each parameter using the `--s
 
 ```console
 $ helm install custom-config --name custom-config \
-  --set Image.tag=centos8-13.3-4.7.0-rc.1
+  --set Image.tag=centos8-13.3-4.7.0
 ```
 
-The above command changes the image tag of the container to of `centos8-13.3-4.7.0-rc.1`.
+The above command changes the image tag of the container to of `centos8-13.3-4.7.0`.
 
 > **Tip**: You can use the default [values.yaml](values.yaml)
 
@@ -84,7 +84,7 @@ The above command changes the image tag of the container to of `centos8-13.3-4.7
 | `.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.    | `centos8-13.3-4.7.0-rc.1`                                                    |
+| `.image.tag` | The image tag to be used.    | `centos8-13.3-4.7.0`                                                    |
 | `.resources.cpu` | Defines a limit for CPU    | `200m`                                                    |
 | `.resources.memory` | Defines a limit for memory    | `512Mi`                                                    |
 
diff --git a/examples/helm/custom-config/values.yaml b/examples/helm/custom-config/values.yaml
@@ -10,7 +10,7 @@ serviceType: ClusterIP
 image:
   repository: crunchydata
   container: crunchy-postgres
-  tag: centos8-13.3-4.7.0-rc.1
+  tag: centos8-13.3-4.7.0
 resources:
   cpu: 200m
   memory: 512Mi
diff --git a/examples/helm/primary-replica/Chart.yaml b/examples/helm/primary-replica/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 name: primary-replica
 description: Deploy a basic crunchy primary and replica cluster
 version: 1
-appVersion: 4.7.0-rc.1
+appVersion: 4.7.0
 keywords:
 - postgresql
 - postgres
diff --git a/examples/helm/primary-replica/README.md b/examples/helm/primary-replica/README.md
@@ -102,10 +102,10 @@ See `values.yaml` for configuration notes. Specify each parameter using the `--s
 
 ```console
 $ helm install primary-replica --name primary-replica \
-  --set Image.tag=centos8-13.3-4.7.0-rc.1
+  --set Image.tag=centos8-13.3-4.7.0
 ```
 
-The above command changes the image tag of the container to `centos8-13.3-4.7.0-rc.1`.
+The above command changes the image tag of the container to `centos8-13.3-4.7.0`.
 
 > **Tip**: You can use the default [values.yaml](values.yaml)
 
@@ -121,7 +121,7 @@ The above command changes the image tag of the container to `centos8-13.3-4.7.0-
 | `.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.    | `centos8-13.3-4.7.0-rc.1`                                                    |
+| `.image.tag` | The image tag to be used.    | `centos8-13.3-4.7.0`                                                    |
 | `.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`                                                    |
diff --git a/examples/helm/primary-replica/values.yaml b/examples/helm/primary-replica/values.yaml
@@ -12,7 +12,7 @@ serviceType: ClusterIP
 image:
   repository: crunchydata
   container: crunchy-postgres
-  tag: centos8-11.12-4.7.0-rc.1
+  tag: centos8-11.12-4.7.0
 pv:
   storage: 400M
   name: primary-pv
diff --git a/examples/helm/primary/Chart.yaml b/examples/helm/primary/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 name: basic
 description: Deploys a single PostgreSQL primary database
 version: 1
-appVersion: 4.7.0-rc.1
+appVersion: 4.7.0
 keywords:
 - postgresql
 - postgres
diff --git a/examples/helm/primary/README.md b/examples/helm/primary/README.md
@@ -65,7 +65,7 @@ See `values.yaml` for configuration notes. Specify each parameter using the `--s
 
 ```console
 $ helm install primary --name primary \
-  --set Image.tag=centos8-13.3-4.7.0-rc.1
+  --set Image.tag=centos8-13.3-4.7.0
 ```
 
 > **Tip**: You can use the default [values.yaml](values.yaml)
@@ -81,7 +81,7 @@ $ helm install primary --name primary \
 | `.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.    | `centos8-13.3-4.7.0-rc.1`                                                    |
+| `.image.tag` | The image tag to be used.    | `centos8-13.3-4.7.0`                                                    |
 | `.resources.cpu` | Defines a limit for CPU    | `200m`                                                    |
 | `.resources.memory` | Defines a limit for memory    | `512Mi`                                                    |
 
diff --git a/examples/helm/primary/values.yaml b/examples/helm/primary/values.yaml
@@ -10,7 +10,7 @@ serviceType: ClusterIP
 image:
   repository: crunchydata
   container: crunchy-postgres
-  tag: centos8-13.3-4.7.0-rc.1
+  tag: centos8-13.3-4.7.0
 resources:
   cpu: 200m
   memory: 512Mi
diff --git a/examples/helm/template-small/Chart.yaml b/examples/helm/template-small/Chart.yaml
@@ -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.7.0-rc.1
+appVersion: 4.7.0
 keywords:
 - postgresql
 - postgres
diff --git a/examples/helm/template-small/README.md b/examples/helm/template-small/README.md
@@ -75,7 +75,7 @@ See `values.yaml` for configuration notes. Specify each parameter using the `--s
 
 ```console
 $ helm install template-small --name template-small \
-  --set Image.tag=centos8-13.3-4.7.0-rc.1
+  --set Image.tag=centos8-13.3-4.7.0
 ```
 
 > **Tip**: You can use the default [values.yaml](values.yaml)
@@ -91,7 +91,7 @@ $ helm install template-small --name template-small \
 | `.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.    | `centos8-13.3-4.7.0-rc.1`                                                    |
+| `.image.tag` | The image tag to be used.    | `centos8-13.3-4.7.0`                                                    |
 | `.resources.cpu` | Defines a limit for CPU    | `200m`                                                    |
 | `.resources.memory` | Defines a limit for memory    | `512Mi`                                                    |
 
diff --git a/examples/helm/template-small/values.yaml b/examples/helm/template-small/values.yaml
@@ -12,7 +12,7 @@ serviceType: ClusterIP
 image:
   repository: crunchydata
   container: crunchy-postgres
-  tag: centos8-13.3-4.7.0-rc.1
+  tag: centos8-13.3-4.7.0
 resources:
   cpu: 200m
   memory: 512Mi
diff --git a/redhat/atomic/help.1 b/redhat/atomic/help.1
@@ -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.7.0-rc.1"
+The specific release number of the container. For example, Release="4.7.0"
diff --git a/redhat/atomic/help.md b/redhat/atomic/help.md
@@ -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.7.0-rc.1"
+The specific release number of the container. For example, Release="4.7.0"
