merge pre32 into master

Author: jmccormick2001

Makefile

@@ -43,13 +43,17 @@ gendeps:
 	github.com/crunchydata/postgres-operator/apiserver/userservice \
 	github.com/crunchydata/postgres-operator/apiserver/util \
 	github.com/crunchydata/postgres-operator/apiserver/versionservice 
+installrbac:
+	cd deploy && ./install-rbac.sh
 setup:
 	./bin/get-deps.sh
+	cd examples/backrest-config && ./create.sh
 setupnamespace:
 	kubectl create -f ./examples/demo-namespace.json
 	kubectl config set-context demo --cluster=kubernetes --namespace=demo --user=kubernetes-admin
 	kubectl config use-context demo
-
+bounce:
+	kubectl get pod --selector=name=postgres-operator -o=jsonpath="{.items[0].metadata.name}" | xargs kubectl delete pod
 deployoperator:
 	cd deploy && ./deploy.sh
 main:	check-go-vars
@@ -60,6 +64,12 @@ runapiserver:	check-go-vars
 	apiserver --kubeconfig=/etc/kubernetes/admin.conf
 apiserver:	check-go-vars
 	go install apiserver.go
+pgo-backrest:	check-go-vars
+	go install pgo-backrest/pgo-backrest.go
+	mv $(GOBIN)/pgo-backrest ./bin/pgo-backrest/
+pgo-backrest-image:	check-go-vars pgo-backrest
+	docker build -t pgo-backrest -f $(CO_BASEOS)/Dockerfile.pgo-backrest.$(CO_BASEOS) .
+	docker tag pgo-backrest $(CO_IMAGE_PREFIX)/pgo-backrest:$(CO_IMAGE_TAG)
 pgo:	check-go-vars
 	cd pgo && go install pgo.go
 clean:	check-go-vars
@@ -97,12 +107,14 @@ all:
 	make loadimage
 	make pgo
 	make rmdataimage
+	make pgo-backrest-image
 push:
 	docker push $(CO_IMAGE_PREFIX)/pgo-lspvc:$(CO_IMAGE_TAG)
 	docker push $(CO_IMAGE_PREFIX)/pgo-rmdata:$(CO_IMAGE_TAG)
 	docker push $(CO_IMAGE_PREFIX)/pgo-load:$(CO_IMAGE_TAG)
 	docker push $(CO_IMAGE_PREFIX)/postgres-operator:$(CO_IMAGE_TAG)
 	docker push $(CO_IMAGE_PREFIX)/pgo-apiserver:$(CO_IMAGE_TAG)
+	docker push $(CO_IMAGE_PREFIX)/pgo-backrest:$(CO_IMAGE_TAG)
 pull:
 	docker pull $(CO_IMAGE_PREFIX)/pgo-lspvc:$(CO_IMAGE_TAG)
 	docker pull $(CO_IMAGE_PREFIX)/pgo-rmdata:$(CO_IMAGE_TAG)

README.adoc

@@ -5,7 +5,7 @@
 </p>
 ++++
 
-Latest Release: v3.1, {docdate}
+Latest Release: 3.2.0 {docdate}
 
 == General
 
@@ -21,7 +21,7 @@ image::btn.png[Official Documentation]
 
 To build and deploy the Operator on your Kubernetes system, follow the instructions documented on the link:https://crunchydata.github.io/postgres-operator/installation/[Installation] page.
 
-If you're seeking to upgrade your existing Operator installation, please visit the link:https://crunchydata.github.io/postgres-operator/installation/upgrading-the-operator/[Upgrading the Operator] page.
+If you're seeking to upgrade your existing Operator installation, please visit the link:https://crunchydata.github.io/postgres-operator/installation/upgrading-the-operator/[Upgrading the Operator] page.  Also read the Release Notes as to details on recent changes to the Operator.
 
 More design information is found on the link:https://crunchydata.github.io/postgres-operator/how-it-works/[How It Works] page.
 

apis/cr/v1/common.go

@@ -47,6 +47,7 @@ type PgStorageSpec struct {
 	StorageType        string `json:"storagetype"`
 	Fsgroup            string `json:"fsgroup"`
 	SupplementalGroups string `json:"supplementalgroups"`
+	MatchLabels        string `json:"matchLabels"`
 }
 
 // PgContainerResource ...

apis/cr/v1/task.go

@@ -28,6 +28,11 @@ const PgtaskFailover = "failover"
 const PgtaskAutoFailover = "autofailover"
 const PgtaskAddPolicies = "addpolicies"
 
+const PgtaskBackrest = "backrest"
+const PgtaskBackrestBackup = "backup"
+const PgtaskBackrestInfo = "info"
+const PgtaskBackrestRestore = "restore"
+
 // PgtaskSpec ...
 type PgtaskSpec struct {
 	Name        string        `json:"name"`

apiserver.go

@@ -20,6 +20,7 @@ import (
 	"crypto/x509"
 	log "github.com/Sirupsen/logrus"
 	"github.com/crunchydata/postgres-operator/apiserver"
+	"github.com/crunchydata/postgres-operator/apiserver/backrestservice"
 	"github.com/crunchydata/postgres-operator/apiserver/backupservice"
 	"github.com/crunchydata/postgres-operator/apiserver/clusterservice"
 	"github.com/crunchydata/postgres-operator/apiserver/configservice"
@@ -30,6 +31,7 @@ import (
 	"github.com/crunchydata/postgres-operator/apiserver/loadservice"
 	"github.com/crunchydata/postgres-operator/apiserver/policyservice"
 	"github.com/crunchydata/postgres-operator/apiserver/pvcservice"
+	"github.com/crunchydata/postgres-operator/apiserver/reloadservice"
 	"github.com/crunchydata/postgres-operator/apiserver/statusservice"
 	"github.com/crunchydata/postgres-operator/apiserver/upgradeservice"
 	"github.com/crunchydata/postgres-operator/apiserver/userservice"
@@ -89,6 +91,7 @@ func main() {
 	r.HandleFunc("/load", loadservice.LoadHandler).Methods("POST")
 	r.HandleFunc("/user", userservice.UserHandler).Methods("POST")
 	r.HandleFunc("/users", userservice.CreateUserHandler).Methods("POST")
+	r.HandleFunc("/users/{name}", userservice.ShowUserHandler).Methods("GET")
 	//here
 	r.HandleFunc("/usersdelete/{name}", userservice.DeleteUserHandler).Methods("GET")
 	r.HandleFunc("/upgrades", upgradeservice.CreateUpgradeHandler).Methods("POST")
@@ -101,6 +104,8 @@ func main() {
 	r.HandleFunc("/clustersdelete/{name}", clusterservice.DeleteClusterHandler).Methods("GET")
 	r.HandleFunc("/clusters/test/{name}", clusterservice.TestClusterHandler)
 	r.HandleFunc("/clusters/scale/{name}", clusterservice.ScaleClusterHandler)
+	r.HandleFunc("/scale/{name}", clusterservice.ScaleQueryHandler).Methods("GET")
+	r.HandleFunc("/scaledown/{name}", clusterservice.ScaleDownHandler).Methods("GET")
 	r.HandleFunc("/status", statusservice.StatusHandler)
 	r.HandleFunc("/df/{name}", dfservice.DfHandler)
 	r.HandleFunc("/config", configservice.ShowConfigHandler)
@@ -109,6 +114,10 @@ func main() {
 	//here
 	r.HandleFunc("/backupsdelete/{name}", backupservice.DeleteBackupHandler).Methods("GET")
 	r.HandleFunc("/backups", backupservice.CreateBackupHandler).Methods("POST")
+	r.HandleFunc("/backrestbackup", backrestservice.CreateBackupHandler).Methods("POST")
+	r.HandleFunc("/backrest/{name}", backrestservice.ShowBackrestHandler).Methods("GET")
+	r.HandleFunc("/restore", backrestservice.RestoreHandler).Methods("POST")
+	r.HandleFunc("/reload", reloadservice.ReloadHandler).Methods("POST")
 	r.HandleFunc("/failover", failoverservice.CreateFailoverHandler).Methods("POST")
 	r.HandleFunc("/failover/{name}", failoverservice.QueryFailoverHandler).Methods("GET")
 
@@ -144,5 +153,4 @@ func main() {
 	}
 
 	log.Fatal(srv.ListenAndServeTLS(serverCert, serverKey))
-	//log.Fatal(http.ListenAndServe(":8080", r))
 }