Skip to content

Commit 7e867eb

Browse files
author
jmccormick2001
committed
fix merge conflict
2 parents e7ca007 + 8523f1b commit 7e867eb

File tree

345 files changed

+3578
-865
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

345 files changed

+3578
-865
lines changed

‎Gopkg.lock‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎LICENSE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@
176176

177177
END OF TERMS AND CONDITIONS
178178

179-
Copyright 2017 - 2018 Crunchy Data Solutions, Inc.
179+
Copyright 2017 - 2019 Crunchy Data Solutions, Inc.
180180

181181
Licensed under the Apache License, Version 2.0 (the "License");
182182
you may not use this file except in compliance with the License.

‎Makefile‎

Lines changed: 23 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ runmain: check-go-vars
6363
postgres-operator --kubeconfig=/etc/kubernetes/admin.conf
6464
runapiserver: check-go-vars
6565
apiserver --kubeconfig=/etc/kubernetes/admin.conf
66-
apiserver: check-go-vars
66+
pgo-apiserver: check-go-vars
6767
go install apiserver.go
6868
pgo-backrest: check-go-vars
6969
go install pgo-backrest/pgo-backrest.go
@@ -77,27 +77,21 @@ pgo-backrest-restore-image: check-go-vars
7777
pgo-backrest-repo-image: check-go-vars
7878
docker build -t pgo-backrest-repo -f $(CO_BASEOS)/Dockerfile.pgo-backrest-repo.$(CO_BASEOS) .
7979
docker tag pgo-backrest-repo $(CO_IMAGE_PREFIX)/pgo-backrest-repo:$(CO_IMAGE_TAG)
80-
repo-client-image: check-go-vars
81-
docker build -t repo-client -f $(CO_BASEOS)/Dockerfile.repo-client.$(CO_BASEOS) .
82-
docker tag repo-client $(CO_IMAGE_PREFIX)/repo-client:$(CO_IMAGE_TAG)
83-
foo: check-go-vars
84-
go install foo/foo.go
85-
mv $(GOBIN)/foo ./bin/foo/
8680
cli-docs: check-go-vars
8781
cd $(COROOT)/hugo/content/cli && go run $(COROOT)/pgo/generatedocs.go
8882
pgo: check-go-vars
8983
cd pgo && go install pgo.go
9084
clean: check-go-vars
9185
rm -rf $(GOPATH)/pkg/* $(GOBIN)/postgres-operator $(GOBIN)/apiserver $(GOBIN)/*pgo
92-
apiserverimage: check-go-vars
86+
pgo-apiserver-image: check-go-vars
9387
go install apiserver.go
9488
cp $(GOBIN)/apiserver bin/
9589
docker build -t pgo-apiserver -f $(CO_BASEOS)/Dockerfile.pgo-apiserver.$(CO_BASEOS) .
9690
docker tag pgo-apiserver $(CO_IMAGE_PREFIX)/pgo-apiserver:$(CO_IMAGE_TAG)
9791
# docker push $(CO_IMAGE_PREFIX)/pgo-apiserver:$(CO_IMAGE_TAG)
98-
operator: check-go-vars
92+
postgres-operator: check-go-vars
9993
go install postgres-operator.go
100-
operatorimage: check-go-vars
94+
postgres-operator-image: check-go-vars
10195
go install postgres-operator.go
10296
cp $(GOBIN)/postgres-operator bin/postgres-operator/
10397
docker build -t postgres-operator -f $(CO_BASEOS)/Dockerfile.postgres-operator.$(CO_BASEOS) .
@@ -106,16 +100,16 @@ operatorimage: check-go-vars
106100
deepsix:
107101
cd $(COROOT)/apis/cr/v1
108102
deepcopy-gen --go-header-file=$(COROOT)/apis/cr/v1/header.go.txt --input-dirs=.
109-
lsimage:
103+
pgo-lspvc-image:
110104
docker build -t pgo-lspvc -f $(CO_BASEOS)/Dockerfile.pgo-lspvc.$(CO_BASEOS) .
111105
docker tag pgo-lspvc $(CO_IMAGE_PREFIX)/pgo-lspvc:$(CO_IMAGE_TAG)
112-
loadimage:
106+
pgo-load-image:
113107
docker build -t pgo-load -f $(CO_BASEOS)/Dockerfile.pgo-load.$(CO_BASEOS) .
114108
docker tag pgo-load $(CO_IMAGE_PREFIX)/pgo-load:$(CO_IMAGE_TAG)
115109
pgo-rmdata-image:
116110
docker build -t pgo-rmdata -f $(CO_BASEOS)/Dockerfile.pgo-rmdata.$(CO_BASEOS) .
117111
docker tag pgo-rmdata $(CO_IMAGE_PREFIX)/pgo-rmdata:$(CO_IMAGE_TAG)
118-
sqlrunnerimage:
112+
pgo-sqlrunner-image:
119113
docker build -t pgo-sqlrunner -f $(CO_BASEOS)/Dockerfile.pgo-sqlrunner.$(CO_BASEOS) .
120114
docker tag pgo-sqlrunner $(CO_IMAGE_PREFIX)/pgo-sqlrunner:$(CO_IMAGE_TAG)
121115
pgo-scheduler-image: check-go-vars
@@ -124,36 +118,38 @@ pgo-scheduler-image: check-go-vars
124118
docker build -t pgo-scheduler -f $(CO_BASEOS)/Dockerfile.pgo-scheduler.$(CO_BASEOS) .
125119
docker tag pgo-scheduler $(CO_IMAGE_PREFIX)/pgo-scheduler:$(CO_IMAGE_TAG)
126120
all:
127-
make operatorimage
128-
make apiserverimage
121+
make postgres-operator-image
122+
make pgo-apiserver-image
129123
make pgo-backrest-repo-image
130-
make pgo-backrest-image
131124
make pgo-backrest-restore-image
132125
make pgo
133-
make lsimage
134-
make loadimage
126+
make pgo-lspvc-image
127+
make pgo-load-image
135128
make pgo-rmdata-image
136-
make sqlrunnerimage
129+
make pgo-sqlrunner-image
137130
make pgo-backrest-image
138-
make pgo-backrest-restore-image
139-
make pgo-backrest-repo-image
140131
make pgo-scheduler-image
141132
push:
133+
docker push $(CO_IMAGE_PREFIX)/postgres-operator:$(CO_IMAGE_TAG)
134+
docker push $(CO_IMAGE_PREFIX)/pgo-apiserver:$(CO_IMAGE_TAG)
135+
docker push $(CO_IMAGE_PREFIX)/pgo-backrest-repo:$(CO_IMAGE_TAG)
136+
docker push $(CO_IMAGE_PREFIX)/pgo-backrest-restore:$(CO_IMAGE_TAG)
142137
docker push $(CO_IMAGE_PREFIX)/pgo-lspvc:$(CO_IMAGE_TAG)
143-
docker push $(CO_IMAGE_PREFIX)/pgo-rmdata:$(CO_IMAGE_TAG)
144138
docker push $(CO_IMAGE_PREFIX)/pgo-load:$(CO_IMAGE_TAG)
139+
docker push $(CO_IMAGE_PREFIX)/pgo-rmdata:$(CO_IMAGE_TAG)
145140
docker push $(CO_IMAGE_PREFIX)/pgo-sqlrunner:$(CO_IMAGE_TAG)
146-
docker push $(CO_IMAGE_PREFIX)/postgres-operator:$(CO_IMAGE_TAG)
147-
docker push $(CO_IMAGE_PREFIX)/pgo-apiserver:$(CO_IMAGE_TAG)
148141
docker push $(CO_IMAGE_PREFIX)/pgo-backrest:$(CO_IMAGE_TAG)
149142
docker push $(CO_IMAGE_PREFIX)/pgo-scheduler:$(CO_IMAGE_TAG)
150143
pull:
144+
docker pull $(CO_IMAGE_PREFIX)/postgres-operator:$(CO_IMAGE_TAG)
145+
docker pull $(CO_IMAGE_PREFIX)/pgo-apiserver:$(CO_IMAGE_TAG)
146+
docker pull $(CO_IMAGE_PREFIX)/pgo-backrest-repo:$(CO_IMAGE_TAG)
147+
docker pull $(CO_IMAGE_PREFIX)/pgo-backrest-restore:$(CO_IMAGE_TAG)
151148
docker pull $(CO_IMAGE_PREFIX)/pgo-lspvc:$(CO_IMAGE_TAG)
152-
docker pull $(CO_IMAGE_PREFIX)/pgo-rmdata:$(CO_IMAGE_TAG)
153149
docker pull $(CO_IMAGE_PREFIX)/pgo-load:$(CO_IMAGE_TAG)
150+
docker pull $(CO_IMAGE_PREFIX)/pgo-rmdata:$(CO_IMAGE_TAG)
154151
docker pull $(CO_IMAGE_PREFIX)/pgo-sqlrunner:$(CO_IMAGE_TAG)
155-
docker pull $(CO_IMAGE_PREFIX)/postgres-operator:$(CO_IMAGE_TAG)
156-
docker pull $(CO_IMAGE_PREFIX)/pgo-apiserver:$(CO_IMAGE_TAG)
152+
docker pull $(CO_IMAGE_PREFIX)/pgo-backrest:$(CO_IMAGE_TAG)
157153
docker pull $(CO_IMAGE_PREFIX)/pgo-scheduler:$(CO_IMAGE_TAG)
158154
release: check-go-vars
159155
make macpgo

‎apis/cr/v1/task.go‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ const PgtaskAddPolicies = "addpolicies"
3636

3737
const PgtaskWorkflow = "workflow"
3838
const PgtaskWorkflowCreateClusterType = "createcluster"
39+
const PgtaskWorkflowCreateBenchmarkType = "createbenchmark"
3940
const PgtaskWorkflowBackrestRestoreType = "pgbackrestrestore"
4041
const PgtaskWorkflowSubmittedStatus = "task submitted"
4142
const PgtaskWorkflowCompletedStatus = "task completed"
@@ -56,15 +57,16 @@ const PgtaskpgDumpBackup = "pgdumpbackup"
5657
const PgtaskpgDumpInfo = "pgdumpinfo"
5758
const PgtaskpgRestore = "pgrestore"
5859

60+
const PgtaskBenchmark = "benchmark"
61+
5962
// PgtaskSpec ...
6063
type PgtaskSpec struct {
61-
Namespace string `json:"namespace"`
62-
Name string `json:"name"`
63-
StorageSpec PgStorageSpec `json:"storagespec"`
64-
TaskType string `json:"tasktype"`
65-
Status string `json:"status"`
66-
//Parameters string `json:"parameters"`
67-
Parameters map[string]string `json:"parameters"`
64+
Namespace string `json:"namespace"`
65+
Name string `json:"name"`
66+
StorageSpec PgStorageSpec `json:"storagespec"`
67+
TaskType string `json:"tasktype"`
68+
Status string `json:"status"`
69+
Parameters map[string]string `json:"parameters"`
6870
}
6971

7072
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object

‎apiserver.go‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package main
22

33
/*
4-
Copyright 2017 Crunchy Data Solutions, Inc.
4+
Copyright 2019 Crunchy Data Solutions, Inc.
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.
77
You may obtain a copy of the License at
@@ -23,10 +23,10 @@ import (
2323
"os"
2424
"strconv"
2525

26-
log "github.com/Sirupsen/logrus"
2726
"github.com/crunchydata/postgres-operator/apiserver"
2827
"github.com/crunchydata/postgres-operator/apiserver/backrestservice"
2928
"github.com/crunchydata/postgres-operator/apiserver/backupservice"
29+
"github.com/crunchydata/postgres-operator/apiserver/benchmarkservice"
3030
"github.com/crunchydata/postgres-operator/apiserver/clusterservice"
3131
"github.com/crunchydata/postgres-operator/apiserver/configservice"
3232
"github.com/crunchydata/postgres-operator/apiserver/dfservice"
@@ -46,6 +46,7 @@ import (
4646
"github.com/crunchydata/postgres-operator/apiserver/versionservice"
4747
"github.com/crunchydata/postgres-operator/apiserver/workflowservice"
4848
"github.com/gorilla/mux"
49+
log "github.com/sirupsen/logrus"
4950
)
5051

5152
const serverCert = "/pgo-auth-secret/server.crt"
@@ -141,6 +142,11 @@ func main() {
141142
r.HandleFunc("/scheduledelete", scheduleservice.DeleteScheduleHandler).Methods("POST")
142143
r.HandleFunc("/scheduleshow", scheduleservice.ShowScheduleHandler).Methods("POST")
143144

145+
//benchmark
146+
r.HandleFunc("/benchmark", benchmarkservice.CreateBenchmarkHandler).Methods("POST")
147+
r.HandleFunc("/benchmarkdelete", benchmarkservice.DeleteBenchmarkHandler).Methods("POST")
148+
r.HandleFunc("/benchmarkshow", benchmarkservice.ShowBenchmarkHandler).Methods("POST")
149+
144150
caCert, err := ioutil.ReadFile(serverCert)
145151
if err != nil {
146152
log.Fatal(err)

‎apiserver/backrestservice/backrestimpl.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"strings"
2222
"time"
2323

24-
log "github.com/Sirupsen/logrus"
24+
log "github.com/sirupsen/logrus"
2525
crv1 "github.com/crunchydata/postgres-operator/apis/cr/v1"
2626
"github.com/crunchydata/postgres-operator/apiserver"
2727
msgs "github.com/crunchydata/postgres-operator/apiservermsgs"

‎apiserver/backrestservice/backrestservice.go‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ limitations under the License.
1717

1818
import (
1919
"encoding/json"
20-
log "github.com/Sirupsen/logrus"
2120
"github.com/crunchydata/postgres-operator/apiserver"
2221
msgs "github.com/crunchydata/postgres-operator/apiservermsgs"
2322
"github.com/crunchydata/postgres-operator/util"
2423
"github.com/gorilla/mux"
24+
log "github.com/sirupsen/logrus"
2525
"net/http"
2626
)
2727

@@ -41,8 +41,9 @@ func CreateBackupHandler(w http.ResponseWriter, r *http.Request) {
4141
return
4242
}
4343

44-
w.WriteHeader(http.StatusOK)
44+
w.Header().Set("WWW-Authenticate", `Basic realm="Restricted"`)
4545
w.Header().Set("Content-Type", "application/json")
46+
w.WriteHeader(http.StatusOK)
4647

4748
resp := msgs.CreateBackrestBackupResponse{}
4849
resp.Status = msgs.Status{Code: msgs.Ok, Msg: ""}
@@ -77,9 +78,9 @@ func ShowBackrestHandler(w http.ResponseWriter, r *http.Request) {
7778
if err != nil {
7879
return
7980
}
80-
w.WriteHeader(http.StatusOK)
8181
w.Header().Set("WWW-Authenticate", `Basic realm="Restricted"`)
8282
w.Header().Set("Content-Type", "application/json")
83+
w.WriteHeader(http.StatusOK)
8384

8485
log.Debug("backrestservice.ShowBackrestHandler GET called")
8586
resp := msgs.ShowBackrestResponse{}
@@ -117,8 +118,9 @@ func RestoreHandler(w http.ResponseWriter, r *http.Request) {
117118
return
118119
}
119120

120-
w.WriteHeader(http.StatusOK)
121+
w.Header().Set("WWW-Authenticate", `Basic realm="Restricted"`)
121122
w.Header().Set("Content-Type", "application/json")
123+
w.WriteHeader(http.StatusOK)
122124

123125
resp := msgs.RestoreResponse{}
124126
resp.Status = msgs.Status{Code: msgs.Ok, Msg: ""}

‎apiserver/backupservice/backupimpl.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ limitations under the License.
1616
*/
1717

1818
import (
19-
log "github.com/Sirupsen/logrus"
2019
crv1 "github.com/crunchydata/postgres-operator/apis/cr/v1"
2120
"github.com/crunchydata/postgres-operator/apiserver"
2221
msgs "github.com/crunchydata/postgres-operator/apiservermsgs"
2322
"github.com/crunchydata/postgres-operator/kubeapi"
2423
"github.com/crunchydata/postgres-operator/util"
24+
log "github.com/sirupsen/logrus"
2525
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2626
)
2727

@@ -90,7 +90,7 @@ func DeleteBackup(backupName, ns string) msgs.DeleteBackupResponse {
9090
dataRoots := []string{backupName + "-backups"}
9191

9292
storageSpec := crv1.PgStorageSpec{}
93-
err = apiserver.CreateRMDataTask(storageSpec, backupName, pvcName, dataRoots, ns)
93+
err = apiserver.CreateRMDataTask(storageSpec, backupName, pvcName, dataRoots, backupName+"-backup", ns)
9494
if err != nil {
9595
resp.Status.Code = msgs.Error
9696
resp.Status.Msg = err.Error()

‎apiserver/backupservice/backupservice.go‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ limitations under the License.
1717

1818
import (
1919
"encoding/json"
20-
log "github.com/Sirupsen/logrus"
2120
"github.com/crunchydata/postgres-operator/apiserver"
2221
msgs "github.com/crunchydata/postgres-operator/apiservermsgs"
2322
"github.com/gorilla/mux"
23+
log "github.com/sirupsen/logrus"
2424
"net/http"
2525
)
2626

@@ -43,9 +43,9 @@ func ShowBackupHandler(w http.ResponseWriter, r *http.Request) {
4343
return
4444
}
4545

46-
w.WriteHeader(http.StatusOK)
4746
w.Header().Set("WWW-Authenticate", `Basic realm="Restricted"`)
4847
w.Header().Set("Content-Type", "application/json")
48+
w.WriteHeader(http.StatusOK)
4949

5050
log.Debug("backupservice.ShowBackupHandler GET called")
5151
resp := msgs.ShowBackupResponse{}
@@ -87,9 +87,10 @@ func DeleteBackupHandler(w http.ResponseWriter, r *http.Request) {
8787
if err != nil {
8888
return
8989
}
90-
w.WriteHeader(http.StatusOK)
9190
w.Header().Set("WWW-Authenticate", `Basic realm="Restricted"`)
9291
w.Header().Set("Content-Type", "application/json")
92+
w.WriteHeader(http.StatusOK)
93+
9394
log.Debug("backupservice.DeleteBackupHandler called")
9495

9596
resp := msgs.DeleteBackupResponse{}
@@ -128,8 +129,10 @@ func CreateBackupHandler(w http.ResponseWriter, r *http.Request) {
128129
if err != nil {
129130
return
130131
}
131-
w.WriteHeader(http.StatusOK)
132+
133+
w.Header().Set("WWW-Authenticate", `Basic realm="Restricted"`)
132134
w.Header().Set("Content-Type", "application/json")
135+
w.WriteHeader(http.StatusOK)
133136

134137
resp := msgs.CreateBackupResponse{}
135138
resp.Status = msgs.Status{Code: msgs.Ok, Msg: ""}

0 commit comments

Comments
 (0)