updated for versions for PostgreSQL minor version (#925)

cahoonpwork · Jonathan S. Katz · commit 3bba67f2daf9 · 2019-10-24T14:34:56.000-04:00
* updated version numbers, backrest 2.15,  moved 3.5.x Operator to 2.4.x containers

* pgo cli documentation updates

* updated for versions for PostgreSQL minor version
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.4-2.4.2
+CCP_IMAGE_TAG=centos7-11.5-2.4.2
 
 IMAGES=(
 crunchy-prometheus
diff --git a/centos7/Dockerfile.pgo-apiserver.centos7 b/centos7/Dockerfile.pgo-apiserver.centos7
@@ -2,7 +2,7 @@ FROM centos:7
 
 LABEL Vendor="Crunchy Data Solutions" \
 	PostgresVersion="11" \
-	PostgresFullVersion="11.4" \
+	PostgresFullVersion="11.5" \
 	Version="7.6" \
 	Release="3.5.5" \
 	summary="Crunchy Data PostgreSQL Operator - Apiserver" \
diff --git a/centos7/Dockerfile.pgo-backrest-repo.centos7 b/centos7/Dockerfile.pgo-backrest-repo.centos7
@@ -2,7 +2,7 @@ FROM centos:7
 
 LABEL Vendor="Crunchy Data Solutions" \
 	PostgresVersion="11" \
-	PostgresFullVersion="11.4" \
+	PostgresFullVersion="11.5" \
 	Version="7.6" \
 	Release="3.5.5" \
 	summary="Crunchy Data PostgreSQL Operator - Apiserver" \
diff --git a/centos7/Dockerfile.pgo-backrest-restore.centos7 b/centos7/Dockerfile.pgo-backrest-restore.centos7
@@ -2,7 +2,7 @@ FROM centos:7
 
 LABEL Vendor="Crunchy Data Solutions" \
 	PostgresVersion="11" \
-	PostgresFullVersion="11.4" \
+	PostgresFullVersion="11.5" \
 	Version="7.6" \
 	Release="3.5.5" \
 	summary="Crunchy Data PostgreSQL Operator - pgBackRest" \
diff --git a/centos7/Dockerfile.pgo-backrest.centos7 b/centos7/Dockerfile.pgo-backrest.centos7
@@ -2,7 +2,7 @@ FROM centos:7
 
 LABEL Vendor="Crunchy Data Solutions" \
 	PostgresVersion="11" \
-	PostgresFullVersion="11.4" \
+	PostgresFullVersion="11.5" \
 	Version="7.6" \
 	Release="3.5.5" \
 	summary="Crunchy Data PostgreSQL Operator - pgBackRest" \
diff --git a/centos7/Dockerfile.pgo-load.centos7 b/centos7/Dockerfile.pgo-load.centos7
@@ -3,7 +3,7 @@ FROM centos:7
 LABEL name="crunchydata/pgo-load" \
     vendor="crunchy data" \
 	PostgresVersion="11" \
-	PostgresFullVersion="11.4" \
+	PostgresFullVersion="11.5" \
 	Version="7.6" \
 	Release="3.5.5" \
     url="https://crunchydata.com" \
diff --git a/centos7/Dockerfile.postgres-operator.centos7 b/centos7/Dockerfile.postgres-operator.centos7
@@ -2,7 +2,7 @@ FROM centos:7
 
 LABEL  Vendor="Crunchy Data Solutions" \
 	PostgresVersion="11" \
-	PostgresFullVersion="11.4" \
+	PostgresFullVersion="11.5" \
 	Version="7.6" \
 	Release="3.5.5" \
 	summary="Crunchy Data PostgreSQL Operator" \
diff --git a/chart/postgres-operator/values.yaml b/chart/postgres-operator/values.yaml
@@ -10,7 +10,7 @@ image:
 env:
   debug: "true"
   ccp_image_prefix: "crunchydata"
-  ccp_image_tag: "centos7-11.4-2.4.2"
+  ccp_image_tag: "centos7-11.5-2.4.2"
   co_image_prefix: "crunchydata"
   co_image_tag: "centos7-3.5.5"
   tls_no_verify: false
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.4-2.4.2
+  CCPImageTag:  centos7-11.5-2.4.2
   Port:  5432
   User:  testuser
   Database:  userdb
diff --git a/conf/postgres-operator/pgo.yaml.quickstart b/conf/postgres-operator/pgo.yaml.quickstart
@@ -1,7 +1,7 @@
 Cluster:
-  PrimaryNodeLabel:  
-  ReplicaNodeLabel: 
-  CCPImagePrefix: $CCP_IMAGE_PREFIX 
+  PrimaryNodeLabel:
+  ReplicaNodeLabel:
+  CCPImagePrefix: $CCP_IMAGE_PREFIX
   Metrics:  false
   Badger:  false
   CCPImageTag:  $CCP_IMAGE_TAG
@@ -39,13 +39,13 @@ Storage:
     StorageType:  dynamic
     StorageClass:  fast
     Fsgroup:  26
-DefaultContainerResources: 
-DefaultLoadResources:  
-DefaultLspvcResources:  
-DefaultRmdataResources:  
-DefaultBackupResources:  
-DefaultPgbouncerResources:  
-DefaultPgpoolResources:   
+DefaultContainerResources:
+DefaultLoadResources:
+DefaultLspvcResources:
+DefaultRmdataResources:
+DefaultBackupResources:
+DefaultPgbouncerResources:
+DefaultPgpoolResources:
 ContainerResources:
   small:
     RequestsMemory:  512Mi
@@ -59,7 +59,7 @@ ContainerResources:
     LimitsCPU:  4.0
 Pgo:
   AutofailSleepSeconds:  9
-  PreferredFailoverNode:  
+  PreferredFailoverNode:
   Audit:  false
   LSPVCTemplate:  /pgo-config/pgo.lspvc-template.json
   LoadTemplate:  /pgo-config/pgo.load-template.json
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.4-2.4.2)
+    cluster : fromcrd (centos7-11.5-2.4.2)
     	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
@@ -67,7 +67,7 @@
         },
         "backuppath": "",
         "backuppvcname": "",
-        "ccpimagetag": "centos7-11.4-2.4.2",
+        "ccpimagetag": "centos7-11.5-2.4.2",
         "clustername": "fromcrd",
         "customconfig": "",
         "database": "userdb",
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.4-2.4.2), 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.5-2.4.2), 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)
diff --git a/rhel7/Dockerfile.pgo-apiserver.rhel7 b/rhel7/Dockerfile.pgo-apiserver.rhel7
@@ -5,7 +5,7 @@ MAINTAINER jeff.mccormick@crunchydata.com
 LABEL name="pgo-apiserver-" \
 	vendor="crunchydata.com" \
 	PostgresVersion="11" \
-	PostgresFullVersion="11.4" \
+	PostgresFullVersion="11.5" \
 	Version="7.6" \
 	Release="3.5.5" \
 	run='docker run -d -p 8080:80 --name=web-app web-app' \
diff --git a/rhel7/Dockerfile.pgo-backrest-repo.rhel7 b/rhel7/Dockerfile.pgo-backrest-repo.rhel7
@@ -3,7 +3,7 @@ FROM registry.access.redhat.com/rhel7
 LABEL Vendor="Crunchy Data Solutions" \
 	PostgresVersion="11" \
 	name="pgo-backrest-repo" \
-	PostgresFullVersion="11.4" \
+	PostgresFullVersion="11.5" \
 	Version="7.6" \
 	Release="3.5.5" \
         run='docker run -d -p 8080:80 --name=web-app web-app' \
diff --git a/rhel7/Dockerfile.pgo-backrest-restore.rhel7 b/rhel7/Dockerfile.pgo-backrest-restore.rhel7
@@ -3,7 +3,7 @@ FROM registry.access.redhat.com/rhel7
 LABEL Vendor="Crunchy Data Solutions" \
 	PostgresVersion="11" \
 	name="pgo-backrest-restore" \
-	PostgresFullVersion="11.4" \
+	PostgresFullVersion="11.5" \
 	Version="7.6" \
         run='docker run -d -p 8080:80 --name=web-app web-app' \
 	Release="3.5.5" \
diff --git a/rhel7/Dockerfile.pgo-backrest.rhel7 b/rhel7/Dockerfile.pgo-backrest.rhel7
@@ -5,7 +5,7 @@ MAINTAINER jeff.mccormick@crunchydata.com
 LABEL name="crunchydata/pgo-backrest-" \
     vendor="crunchydata.com" \
 	PostgresVersion="11" \
-	PostgresFullVersion="11.4" \
+	PostgresFullVersion="11.5" \
 	Version="7.6" \
 	Release="3.5.5" \
     run='docker run -d -p 8080:80 --name=web-app web-app' \
diff --git a/rhel7/Dockerfile.pgo-load.rhel7 b/rhel7/Dockerfile.pgo-load.rhel7
@@ -5,7 +5,7 @@ MAINTAINER jeff.mccormick@crunchydata.com
 LABEL name="crunchydata/pgo-load-" \
     vendor="crunchydata.com" \
 	PostgresVersion="11" \
-	PostgresFullVersion="11.4" \
+	PostgresFullVersion="11.5" \
 	Version="7.6" \
 	Release="3.5.5" \
     run='docker run -d -p 8080:80 --name=web-app web-app' \
diff --git a/rhel7/Dockerfile.postgres-operator.rhel7 b/rhel7/Dockerfile.postgres-operator.rhel7
@@ -5,7 +5,7 @@ MAINTAINER jeff.mccormick@crunchydata.com
 LABEL name="postgres-operator" \
 	vendor="crunchydata.com" \
 	PostgresVersion="11" \
-	PostgresFullVersion="11.4" \
+	PostgresFullVersion="11.5" \
 	Version="7.6" \
 	Release="3.5.5" \
 	run='docker run -d -p 8080:80 --name=web-app web-app' \
