update version numbers to prep for 4.0.0 release

CrunchyData · jmccormick2001 · May 28, 2019 · Apr 25, 2019 · Apr 25, 2019 · Apr 25, 2019
commit 1e64678d43328f71e8127561b34fafb5a2751897
diff --git a/ansible/inventory b/ansible/inventory
@@ -26,11 +26,11 @@ pgo_tls_no_verify='false'
 
 # Crunchy Container Suite images to use. The tags centos7 and rhel7 are acceptable.
 ccp_image_prefix='crunchydata'
-ccp_image_tag='centos7-11.2-2.4.0-rc5'
+ccp_image_tag='centos7-11.2-2.4.0'
 
 # Crunchy PostgreSQL Operator images to use.  The tags centos7 and rhel7 are acceptable.
 pgo_image_prefix='crunchydata'
-pgo_image_tag='centos7-4.0.0-rc7'
+pgo_image_tag='centos7-4.0.0'
 
 # This will set default enhancements for operator deployed PostgreSQL clusters
 auto_failover='false'

diff --git a/ansible/roles/pgo-operator/vars/main.yml b/ansible/roles/pgo-operator/vars/main.yml
@@ -1,4 +1,4 @@
 ---
-pgo_version: "4.0.0-rc7"
+pgo_version: "4.0.0"
 pgo_client_url: "https://github.com/CrunchyData/postgres-operator/releases/download/{{ pgo_version }}"
 pgo_keys_dir: "~/.pgo/{{ pgo_operator_namespace }}"
diff --git a/apiservermsgs/common.go b/apiservermsgs/common.go
@@ -17,7 +17,7 @@ limitations under the License.
 
 import ()
 
-const PGO_VERSION = "4.0.0-rc8"
+const PGO_VERSION = "4.0.0"
 
 // Ok status
 const Ok = "ok"

diff --git a/bin/push-ccp-to-gcr.sh b/bin/push-ccp-to-gcr.sh
@@ -16,7 +16,7 @@
 GCR_IMAGE_PREFIX=gcr.io/crunchy-dev-test
 
 CCP_IMAGE_PREFIX=crunchydata
-CCP_IMAGE_TAG=centos7-11.2-2.4.0-rc5
+CCP_IMAGE_TAG=centos7-11.2-2.4.0
 
 IMAGES=(
 crunchy-prometheus

diff --git a/conf/postgres-operator/pgo.yaml b/conf/postgres-operator/pgo.yaml
@@ -4,7 +4,7 @@ Cluster:
   CCPImagePrefix:  crunchydata
   Metrics:  false
   Badger:  false
-  CCPImageTag:  centos7-11.2-2.4.0-rc5
+  CCPImageTag:  centos7-11.2-2.4.0
   Port:  5432
   User:  testuser
   Database:  userdb
@@ -94,5 +94,5 @@ Pgo:
   PreferredFailoverNode:  
   Audit:  false
   PGOImagePrefix:  crunchydata
-  PGOImageTag:  centos7-4.0.0-rc8
+  PGOImageTag:  centos7-4.0.0
 
diff --git a/examples/create-by-resource/NOTES.md b/examples/create-by-resource/NOTES.md
@@ -40,7 +40,7 @@ The Operator should show the new cluster started:
 
     jeffmc@~ > pgo show cluster fromcrd
 
-    cluster : fromcrd (centos7-11.2-2.4.0-rc5)
+    cluster : fromcrd (centos7-11.2-2.4.0)
     	pod : fromcrd-6b4d69df46-4s7bn (Running) on doppio-kube (1/1) (primary)
 	pvc : fromcrd
 	resources : CPU Limit= Memory Limit=, CPU Request= Memory Request=

diff --git a/examples/create-by-resource/fromcrd.json b/examples/create-by-resource/fromcrd.json
@@ -68,7 +68,7 @@
         "backuppath": "",
         "backuppvcname": "",
 	"ccpimage":"crunchy-postgres",
-        "ccpimagetag": "centos7-11.2-2.4.0-rc5",
+        "ccpimagetag": "centos7-11.2-2.4.0",
         "clustername": "fromcrd",
         "customconfig": "",
         "database": "userdb",

diff --git a/examples/envs.sh b/examples/envs.sh
@@ -17,7 +17,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=crunchydata
 export PGO_BASEOS=centos7
-export PGO_VERSION=4.0.0-rc7
+export PGO_VERSION=4.0.0
 export PGO_IMAGE_TAG=$PGO_BASEOS-$PGO_VERSION
 
 # for the pgo CLI to authenticate with using TLS

diff --git a/examples/load/sample-json-load-config-sc.yaml b/examples/load/sample-json-load-config-sc.yaml
@@ -1,5 +1,5 @@
 PGOImagePrefix:  crunchydata
-PGOImageTag:  centos7-4.0.0-rc7
+PGOImageTag:  centos7-4.0.0
 DbDatabase:  userdb
 DbUser:  postgres
 DbPort:  5432

diff --git a/examples/load/sample-json-load-config.yaml b/examples/load/sample-json-load-config.yaml
@@ -1,5 +1,5 @@
 PGOImagePrefix:  crunchydata
-PGOImageTag:  centos7-4.0.0-rc7
+PGOImageTag:  centos7-4.0.0
 DbDatabase:  userdb
 DbUser:  postgres
 DbPort:  5432

diff --git a/examples/load/sample-load-config.yaml b/examples/load/sample-load-config.yaml
@@ -1,5 +1,5 @@
 PGOImagePrefix:  crunchydata
-PGOImageTag:  centos7-4.0.0-rc8
+PGOImageTag:  centos7-4.0.0
 DbDatabase:  userdb
 DbUser:  postgres
 DbPort:  5432

diff --git a/examples/olm/bundle/pgo.configmap.yaml b/examples/olm/bundle/pgo.configmap.yaml
@@ -75,7 +75,7 @@ data:
       metadata:
         annotations:
           categories: "Database"
-          containerImage: crunchydata/postgres-operator:centos7-4.0.0-rc7
+          containerImage: crunchydata/postgres-operator:centos7-4.0.0
           createdAt: 2019-01-01T11:59:59Z
           support: crunchydata.com
           description: A Postgres Operator from Crunchydata.com
@@ -179,7 +179,7 @@ data:
                               apiVersion: v1
                               fieldPath: metadata.namespace
                         name: scheduler
-                        image: crunchydata/pgo-scheduler:centos7-4.0.0-rc7
+                        image: crunchydata/pgo-scheduler:centos7-4.0.0
                         imagePullPolicy: IfNotPresent
                       - env:
                         - name: CRUNCHY_DEBUG
@@ -196,7 +196,7 @@ data:
                               apiVersion: v1
                               fieldPath: metadata.namespace
                         name: operator
-                        image: crunchydata/postgres-operator:centos7-4.0.0-rc7
+                        image: crunchydata/postgres-operator:centos7-4.0.0
                         imagePullPolicy: IfNotPresent
                       - env:
                         - name: CRUNCHY_DEBUG
@@ -215,7 +215,7 @@ data:
                         - name: TLS_NO_VERIFY
                           value: "false"
                         name: apiserver
-                        image: crunchydata/pgo-apiserver:centos7-4.0.0-rc7
+                        image: crunchydata/pgo-apiserver:centos7-4.0.0
                         imagePullPolicy: IfNotPresent
                         ports:
                         - containerPort: 8443

diff --git a/hugo/content/Configuration/pgo-yaml-configuration.md b/hugo/content/Configuration/pgo-yaml-configuration.md
@@ -18,7 +18,7 @@ The *pgo.yaml* file is broken into major sections as described below:
 |PrimaryNodeLabel        |newly created primary deployments will specify this node label if specified, unless you override it using the --node-label command line flag, if not set, no node label is specifed
 |ReplicaNodeLabel        |newly created replica deployments will specify this node label if specified, unless you override it using the --node-label command line flag, if not set, no node label is specifed
 |CCPImagePrefix        |newly created containers will be based on this image prefix (e.g. crunchydata), update this if you require a custom image prefix
-|CCPImageTag        |newly created containers will be based on this image version (e.g. centos7-11.2-2.4.0-rc5), unless you override it using the --ccp-image-tag command line flag
+|CCPImageTag        |newly created containers will be based on this image version (e.g. centos7-11.2-2.4.0), unless you override it using the --ccp-image-tag command line flag
 |Port        | the PostgreSQL port to use for new containers (e.g. 5432)
 |LogStatement        | postgresql.conf log_statement value (required field)
 |LogMinDurationStatement        | postgresql.conf log_min_duration_statement value (required field)