fix merge conflicts

Author: jmccormick2001

Makefile

@@ -83,6 +83,8 @@ repo-client-image:	check-go-vars
 foo:	check-go-vars
 	go install foo/foo.go
 	mv $(GOBIN)/foo ./bin/foo/
+cli-docs:	check-go-vars
+	cd $(COROOT)/hugo/content/cli && go run $(COROOT)/pgo/generatedocs.go
 pgo:	check-go-vars
 	cd pgo && go install pgo.go
 clean:	check-go-vars

apis/cr/v1/backup.go

@@ -22,8 +22,15 @@ import (
 // PgbackupResourcePlural ...
 const PgbackupResourcePlural = "pgbackups"
 
+// Backup job processing states - used by pgdump
+const PgBackupJobSubmitted = "Backup Job Submitted"
+const PgBackupJobInProgress = "Backup Job In Progress"
+const PgBackupJobCompleted = "Backup Job Completed"
+const PgBackupJobError = "Backup Job Error"
+
 // PgbackupSpec ...
 type PgbackupSpec struct {
+	Namespace        string        `json:"namespace"`
 	Name             string        `json:"name"`
 	StorageSpec      PgStorageSpec `json:"storagespec"`
 	CCPImageTag      string        `json:"ccpimagetag"`
@@ -65,7 +72,7 @@ type PgbackupState string
 
 const (
 	// PgbackupStateCreated ...
-	PgbackupStateCreated PgbackupState = "Created"
+	PgbackupStateCreated PgbackupState = "pgbackup Created"
 	// PgbackupStateProcessed ...
-	PgbackupStateProcessed PgbackupState = "Processed"
+	PgbackupStateProcessed PgbackupState = "pgbackup Processed"
 )

apis/cr/v1/cluster.go

@@ -33,9 +33,11 @@ type Pgcluster struct {
 
 // PgclusterSpec ...
 type PgclusterSpec struct {
+	Namespace          string               `json:"namespace"`
 	Name               string               `json:"name"`
 	ClusterName        string               `json:"clustername"`
 	Policies           string               `json:"policies"`
+	CCPImage           string               `json:"ccpimage"`
 	CCPImageTag        string               `json:"ccpimagetag"`
 	Port               string               `json:"port"`
 	NodeName           string               `json:"nodename"`
@@ -81,7 +83,7 @@ type PgclusterState string
 
 const (
 	// PgclusterStateCreated ...
-	PgclusterStateCreated PgclusterState = "Created"
+	PgclusterStateCreated PgclusterState = "pgcluster Created"
 	// PgclusterStateProcessed ...
-	PgclusterStateProcessed PgclusterState = "Processed"
+	PgclusterStateProcessed PgclusterState = "pgcluster Processed"
 )

apis/cr/v1/deepcopy.go

@@ -8,6 +8,7 @@ func (in *Pgbackup) DeepCopyInto(out *Pgbackup) {
 	out.TypeMeta = in.TypeMeta
 	out.ObjectMeta = in.ObjectMeta
 	out.Spec = PgbackupSpec{
+		Namespace:        in.Spec.Namespace,
 		Name:             in.Spec.Name,
 		StorageSpec:      in.Spec.StorageSpec,
 		CCPImageTag:      in.Spec.CCPImageTag,
@@ -53,11 +54,13 @@ func (in *Pgupgrade) DeepCopyInto(out *Pgupgrade) {
 	out.Status = in.Status
 
 	out.Spec = PgupgradeSpec{
+		Namespace:       in.Spec.Namespace,
 		Name:            in.Spec.Name,
 		ResourceType:    in.Spec.ResourceType,
 		UpgradeType:     in.Spec.UpgradeType,
 		UpgradeStatus:   in.Spec.UpgradeStatus,
 		StorageSpec:     in.Spec.StorageSpec,
+		CCPImage:        in.Spec.CCPImage,
 		CCPImageTag:     in.Spec.CCPImageTag,
 		OldDatabaseName: in.Spec.OldDatabaseName,
 		NewDatabaseName: in.Spec.NewDatabaseName,
@@ -100,6 +103,7 @@ func (in *Pgreplica) DeepCopyInto(out *Pgreplica) {
 	out.ObjectMeta = in.ObjectMeta
 	out.Status = in.Status
 	out.Spec = PgreplicaSpec{
+		Namespace:          in.Spec.Namespace,
 		Name:               in.Spec.Name,
 		ClusterName:        in.Spec.ClusterName,
 		ReplicaStorage:     in.Spec.ReplicaStorage,
@@ -140,9 +144,11 @@ func (in *Pgcluster) DeepCopyInto(out *Pgcluster) {
 	out.ObjectMeta = in.ObjectMeta
 	out.Status = in.Status
 	out.Spec = PgclusterSpec{
+		Namespace:          in.Spec.Namespace,
 		Name:               in.Spec.Name,
 		ClusterName:        in.Spec.ClusterName,
 		Policies:           in.Spec.Policies,
+		CCPImage:           in.Spec.CCPImage,
 		CCPImageTag:        in.Spec.CCPImageTag,
 		Port:               in.Spec.Port,
 		NodeName:           in.Spec.NodeName,
@@ -198,10 +204,11 @@ func (in *Pgpolicy) DeepCopyInto(out *Pgpolicy) {
 	out.TypeMeta = in.TypeMeta
 	out.ObjectMeta = in.ObjectMeta
 	out.Spec = PgpolicySpec{
-		Name:   in.Spec.Name,
-		URL:    in.Spec.URL,
-		SQL:    in.Spec.SQL,
-		Status: in.Spec.Status,
+		Namespace: in.Spec.Namespace,
+		Name:      in.Spec.Name,
+		URL:       in.Spec.URL,
+		SQL:       in.Spec.SQL,
+		Status:    in.Spec.Status,
 	}
 	out.Status = in.Status
 }
@@ -236,6 +243,7 @@ func (in *Pgtask) DeepCopyInto(out *Pgtask) {
 	out.TypeMeta = in.TypeMeta
 	out.ObjectMeta = in.ObjectMeta
 	out.Spec = PgtaskSpec{
+		Namespace:   in.Spec.Namespace,
 		Name:        in.Spec.Name,
 		StorageSpec: in.Spec.StorageSpec,
 		TaskType:    in.Spec.TaskType,

apis/cr/v1/policy.go

@@ -24,10 +24,11 @@ const PgpolicyResourcePlural = "pgpolicies"
 
 // PgpolicySpec ...
 type PgpolicySpec struct {
-	Name   string `json:"name"`
-	URL    string `json:"url"`
-	SQL    string `json:"sql"`
-	Status string `json:"status"`
+	Namespace string `json:"namespace"`
+	Name      string `json:"name"`
+	URL       string `json:"url"`
+	SQL       string `json:"sql"`
+	Status    string `json:"status"`
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
@@ -60,7 +61,7 @@ type PgpolicyState string
 
 const (
 	// PgpolicyStateCreated ...
-	PgpolicyStateCreated PgpolicyState = "Created"
+	PgpolicyStateCreated PgpolicyState = "pgpolicy Created"
 	// PgpolicyStateProcessed ...
-	PgpolicyStateProcessed PgpolicyState = "Processed"
+	PgpolicyStateProcessed PgpolicyState = "pgpolicy Processed"
 )

apis/cr/v1/replica.go

@@ -33,6 +33,7 @@ type Pgreplica struct {
 
 // PgreplicaSpec ...
 type PgreplicaSpec struct {
+	Namespace          string               `json:"namespace"`
 	Name               string               `json:"name"`
 	ClusterName        string               `json:"clustername"`
 	ReplicaStorage     PgStorageSpec        `json:"replicastorage"`
@@ -61,7 +62,7 @@ type PgreplicaState string
 
 const (
 	// PgreplicaStateCreated ...
-	PgreplicaStateCreated PgreplicaState = "Created"
+	PgreplicaStateCreated PgreplicaState = "pgreplica Created"
 	// PgreplicaStateProcessed ...
-	PgreplicaStateProcessed PgreplicaState = "Processed"
+	PgreplicaStateProcessed PgreplicaState = "pgreplica Processed"
 )

apis/cr/v1/task.go

@@ -51,8 +51,14 @@ const PgtaskBackrestInfo = "info"
 const PgtaskBackrestRestore = "restore"
 const PgtaskBackrestStanzaCreate = "stanza-create"
 
+const PgtaskpgDump = "pgdump"
+const PgtaskpgDumpBackup = "pgdumpbackup"
+const PgtaskpgDumpInfo = "pgdumpinfo"
+const PgtaskpgRestore = "pgrestore"
+
 // PgtaskSpec ...
 type PgtaskSpec struct {
+	Namespace   string        `json:"namespace"`
 	Name        string        `json:"name"`
 	StorageSpec PgStorageSpec `json:"storagespec"`
 	TaskType    string        `json:"tasktype"`
@@ -91,7 +97,7 @@ type PgtaskState string
 
 const (
 	// PgtaskStateCreated ...
-	PgtaskStateCreated PgtaskState = "Created"
+	PgtaskStateCreated PgtaskState = "pgtask Created"
 	// PgtaskStateProcessed ...
-	PgtaskStateProcessed PgtaskState = "Processed"
+	PgtaskStateProcessed PgtaskState = "pgtask Processed"
 )

apis/cr/v1/upgrade.go

@@ -30,11 +30,13 @@ const PgupgradeResourcePlural = "pgupgrades"
 
 // PgupgradeSpec ...
 type PgupgradeSpec struct {
+	Namespace       string        `json:"namespace"`
 	Name            string        `json:"name"`
 	ResourceType    string        `json:"resourcetype"`
 	UpgradeType     string        `json:"upgradetype"`
 	UpgradeStatus   string        `json:"upgradestatus"`
 	StorageSpec     PgStorageSpec `json:"storagespec"`
+	CCPImage        string        `json:"ccpimage"`
 	CCPImageTag     string        `json:"ccpimagetag"`
 	OldDatabaseName string        `json:"olddatabasename"`
 	NewDatabaseName string        `json:"newdatabasename"`
@@ -74,7 +76,7 @@ type PgupgradeStatus struct {
 type PgupgradeState string
 
 // PgupgradeStateCreated  ...
-const PgupgradeStateCreated PgupgradeState = "Created"
+const PgupgradeStateCreated PgupgradeState = "pgupgrade Created"
 
 // PgupgradeStateProcessed ...
-const PgupgradeStateProcessed PgupgradeState = "Processed"
+const PgupgradeStateProcessed PgupgradeState = "pgupgrade Processed"

apiserver.go

@@ -34,6 +34,7 @@ import (
 	"github.com/crunchydata/postgres-operator/apiserver/labelservice"
 	"github.com/crunchydata/postgres-operator/apiserver/loadservice"
 	"github.com/crunchydata/postgres-operator/apiserver/pgbouncerservice"
+	"github.com/crunchydata/postgres-operator/apiserver/pgdumpservice"
 	"github.com/crunchydata/postgres-operator/apiserver/pgpoolservice"
 	"github.com/crunchydata/postgres-operator/apiserver/policyservice"
 	"github.com/crunchydata/postgres-operator/apiserver/pvcservice"
@@ -113,13 +114,19 @@ func main() {
 	r.HandleFunc("/df/{name}", dfservice.DfHandler)
 	r.HandleFunc("/config", configservice.ShowConfigHandler)
 
+	// backups / backrest
 	r.HandleFunc("/backups/{name}", backupservice.ShowBackupHandler).Methods("GET")
-	//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")
+
+	// pgdump
+	r.HandleFunc("/pgdumpbackup", pgdumpservice.BackupHandler).Methods("POST")
+	r.HandleFunc("/pgdump/{name}", pgdumpservice.ShowDumpHandler).Methods("GET")
+	r.HandleFunc("/pgdumprestore", pgdumpservice.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")
@@ -148,6 +155,7 @@ func main() {
 		ServerName:         "pgo-apiserver",
 		InsecureSkipVerify: tlsNoVerify,
 		ClientCAs:          caCertPool,
+		MinVersion:         tls.VersionTLS11,
 	}
 
 	log.Info("listening on port " + PORT)