update to version 3.4.0, fix --archive and xlogdir env var support, make --archive and --pgbackrest exclusive of each other, remove old gluster pvc example

Author: jmccormick2001

apiserver/backupservice/backupimpl.go

@@ -183,11 +183,11 @@ func CreateBackup(request *msgs.CreateBackupRequest) msgs.CreateBackupResponse {
 			//DeleteBackup(arg)
 			err = kubeapi.Deletepgbackup(apiserver.RESTClient, arg, apiserver.Namespace)
 
-	if err != nil {
-		log.Error(err)
-		resp.Results = append(resp.Results, "error getting pgbackup for "+arg)
-		break
-	}
+			if err != nil {
+				log.Error(err)
+				resp.Results = append(resp.Results, "error getting pgbackup for "+arg)
+				break
+			}
 		}
 
 		// Create an instance of our CRD

apiserver/clusterservice/clusterimpl.go

@@ -553,6 +553,13 @@ func CreateCluster(request *msgs.CreateClusterRequest) msgs.CreateClusterRespons
 			userLabelsMap[util.LABEL_SERVICE_TYPE] = request.ServiceType
 		}
 
+		if request.ArchiveFlag && request.BackrestFlag {
+			resp.Status.Code = msgs.Error
+			resp.Status.Msg = "error --archive and --pgbackrest flags are mutually exclusive, use one or the other."
+
+			return resp
+		}
+
 		if request.ArchiveFlag {
 			userLabelsMap[util.LABEL_ARCHIVE] = "true"
 			log.Debug("archive set to true in user labels")

apiservermsgs/common.go

@@ -17,7 +17,7 @@ limitations under the License.
 
 import ()
 
-const PGO_VERSION = "3.4.0-rc3"
+const PGO_VERSION = "3.4.0"
 
 // Ok status
 const Ok = "ok"

conf/postgres-operator/cluster/1/cluster-deployment-1.json

@@ -88,6 +88,9 @@
                     }, {
                         "name": "ARCHIVE_TIMEOUT",
                         "value": "{{.ArchiveTimeout}}"
+                    }, {
+                        "name": "XLOGDIR",
+                        "value": "{{.XLOGDir}}"
                     }, {
                         "name": "PGHOST",
                         "value": "/tmp"

conf/postgres-operator/pgo.yaml

@@ -4,7 +4,7 @@ Cluster:
   CCPImagePrefix:  crunchydata
   Metrics:  false
   Badger:  false
-  CCPImageTag:  rhel7-10.6-2.2.0-rc8
+  CCPImageTag:  centos7-10.6-2.2.0
   Port:  5432
   User:  testuser
   Database:  userdb
@@ -19,9 +19,9 @@ Cluster:
   Autofail:  false
   LogStatement:  none
   LogMinDurationStatement:  60000
-PrimaryStorage: storageos
-BackupStorage: storageos
-ReplicaStorage: storageos
+PrimaryStorage: hostpathstorage
+BackupStorage: hostpathstorage
+ReplicaStorage: hostpathstorage
 Storage:
   hostpathstorage:
     AccessMode:  ReadWriteMany
@@ -62,4 +62,4 @@ Pgo:
   LSPVCTemplate:  /pgo-config/pgo.lspvc-template.json
   LoadTemplate:  /pgo-config/pgo.load-template.json
   COImagePrefix:  crunchydata
-  COImageTag:  rhel7-3.4.0-rc3
+  COImageTag:  centos7-3.4.0

examples/gluster/gluster-storage-class.yaml

@@ -1,5 +1,5 @@
 COImagePrefix:  crunchydata
-COImageTag:  rhel7-3.4.0-rc3
+COImageTag:  centos7-3.4.0
 DbDatabase:  userdb
 DbUser:  postgres
 DbPort:  5432

examples/gluster/test-pvc.json

@@ -1,5 +1,5 @@
 COImagePrefix:  crunchydata
-COImageTag:  centos7-3.4.0-rc3
+COImageTag:  centos7-3.4.0
 DbDatabase:  userdb
 DbUser:  postgres
 DbPort:  5432

examples/load/sample-json-load-config.yaml

@@ -31,7 +31,7 @@ echo $CO_BASEOS is the baseos entered | tee -a $LOG
 if [[ "$CO_VERSION" != "" ]]; then
 	echo "CO_VERSION is set to " $CO_VERSION
 else
-	export CO_VERSION=3.4.0-rc2
+	export CO_VERSION=3.4.0
 	echo -n "Which Operator version do you want to install? ["$CO_VERSION"]"
 	read REPLY
 	if [[ "$REPLY" != "" ]]; then
@@ -57,7 +57,7 @@ echo $CO_NAMESPACE is the namespace entered | tee -a $LOG
 if [[ "$CCP_IMAGE_TAG" != "" ]]; then
 	echo "CCP_IMAGE_TAG is set to " $CCP_IMAGE_TAG
 else
-	export CCP_IMAGE_TAG=$CO_BASEOS-10.5-2.2.0-rc7
+	export CCP_IMAGE_TAG=$CO_BASEOS-10.6-2.2.0
 	echo -n "Which CCP image tag do you want to use? ["$CCP_IMAGE_TAG"]"
 	read REPLY
 	if [[ "$REPLY" != "" ]]; then