Skip to content

Commit 37a4318

Browse files
prlaurenceprlaurence
authored
Merge branch 'develop' into doc-patch-design
2 parents 793038d + 6470fef commit 37a4318

File tree

707 files changed

+62633
-3928
lines changed

Some content is hidden

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

707 files changed

+62633
-3928
lines changed

‎Gopkg.lock

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

‎Gopkg.toml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,13 @@ name = "k8s.io/api"
1111
version = "kubernetes-1.9.0"
1212

1313
[[constraint]]
14-
branch = "v2"
15-
name = "gopkg.in/robfig/cron.v2"
14+
branch = "v2"
15+
name = "gopkg.in/robfig/cron.v2"
16+
17+
[[constraint]]
18+
name = "github.com/nsqio/go-nsq"
19+
revision = "v1.0.7"
20+
21+
[[constraint]]
22+
name = "github.com/sirupsen/logrus"
23+
revision = "v1.4.0"

‎Makefile

Lines changed: 54 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -18,31 +18,6 @@ winpgo: check-go-vars
1818
cd pgo && env GOOS=windows GOARCH=386 go build pgo.go && mv pgo.exe $(GOBIN)/pgo.exe
1919
env GOOS=windows GOARCH=386 go build github.com/blang/expenv && mv expenv.exe $(GOBIN)/expenv.exe
2020

21-
22-
gendeps:
23-
godep save \
24-
github.com/crunchydata/postgres-operator/apis/cr/v1 \
25-
github.com/crunchydata/postgres-operator/util \
26-
github.com/crunchydata/postgres-operator/operator \
27-
github.com/crunchydata/postgres-operator/operator/backup \
28-
github.com/crunchydata/postgres-operator/operator/cluster \
29-
github.com/crunchydata/postgres-operator/operator/pvc \
30-
github.com/crunchydata/postgres-operator/controller \
31-
github.com/crunchydata/postgres-operator/client \
32-
github.com/crunchydata/postgres-operator/pgo/cmd \
33-
github.com/crunchydata/postgres-operator/apiservermsgs \
34-
github.com/crunchydata/postgres-operator/apiserver \
35-
github.com/crunchydata/postgres-operator/apiserver/backupservice \
36-
github.com/crunchydata/postgres-operator/apiserver/cloneservice \
37-
github.com/crunchydata/postgres-operator/apiserver/clusterservice \
38-
github.com/crunchydata/postgres-operator/apiserver/labelservice \
39-
github.com/crunchydata/postgres-operator/apiserver/loadservice \
40-
github.com/crunchydata/postgres-operator/apiserver/policyservice \
41-
github.com/crunchydata/postgres-operator/apiserver/pvcservice \
42-
github.com/crunchydata/postgres-operator/apiserver/upgradeservice \
43-
github.com/crunchydata/postgres-operator/apiserver/userservice \
44-
github.com/crunchydata/postgres-operator/apiserver/util \
45-
github.com/crunchydata/postgres-operator/apiserver/versionservice
4621
installrbac:
4722
cd deploy && ./install-rbac.sh
4823
setup:
@@ -61,75 +36,96 @@ runmain: check-go-vars
6136
postgres-operator --kubeconfig=/etc/kubernetes/admin.conf
6237
runapiserver: check-go-vars
6338
apiserver --kubeconfig=/etc/kubernetes/admin.conf
39+
40+
#======= Image builds =======
6441
pgo-apiserver: check-go-vars
6542
go install apiserver.go
6643
pgo-backrest: check-go-vars
6744
go install pgo-backrest/pgo-backrest.go
6845
mv $(GOBIN)/pgo-backrest ./bin/pgo-backrest/
69-
pgo-backrest-image: check-go-vars pgo-backrest
70-
docker build -t pgo-backrest -f $(PGO_BASEOS)/Dockerfile.pgo-backrest.$(PGO_BASEOS) .
71-
docker tag pgo-backrest $(PGO_IMAGE_PREFIX)/pgo-backrest:$(PGO_IMAGE_TAG)
46+
pgo-backrest-image: check-go-vars pgo-backrest
47+
sudo --preserve-env buildah bud $(SQUASH) -f $(PGOROOT)/$(PGO_BASEOS)/Dockerfile.pgo-backrest.$(PGO_BASEOS) -t $(PGO_IMAGE_PREFIX)/pgo-backrest:$(PGO_IMAGE_TAG) $(PGOROOT)
48+
sudo --preserve-env buildah push $(PGO_IMAGE_PREFIX)/pgo-backrest:$(PGO_IMAGE_TAG) docker-daemon:$(PGO_IMAGE_PREFIX)/pgo-backrest:$(PGO_IMAGE_TAG)
49+
docker tag docker.io/$(PGO_IMAGE_PREFIX)/pgo-backrest:$(PGO_IMAGE_TAG) $(PGO_IMAGE_PREFIX)/pgo-backrest:$(PGO_IMAGE_TAG)
50+
51+
pgo-event-image: check-go-vars
52+
sudo --preserve-env buildah bud $(SQUASH) -f $(PGOROOT)/$(PGO_BASEOS)/Dockerfile.pgo-event.$(PGO_BASEOS) -t $(PGO_IMAGE_PREFIX)/pgo-event:$(PGO_IMAGE_TAG) $(PGOROOT)
53+
sudo --preserve-env buildah push $(PGO_IMAGE_PREFIX)/pgo-event:$(PGO_IMAGE_TAG) docker-daemon:$(PGO_IMAGE_PREFIX)/pgo-event:$(PGO_IMAGE_TAG)
54+
docker tag docker.io/$(PGO_IMAGE_PREFIX)/pgo-event:$(PGO_IMAGE_TAG) $(PGO_IMAGE_PREFIX)/pgo-event:$(PGO_IMAGE_TAG)
55+
7256
pgo-backrest-restore-image: check-go-vars
73-
docker build -t pgo-backrest-restore -f $(PGO_BASEOS)/Dockerfile.pgo-backrest-restore.$(PGO_BASEOS) .
74-
docker tag pgo-backrest-restore $(PGO_IMAGE_PREFIX)/pgo-backrest-restore:$(PGO_IMAGE_TAG)
57+
sudo --preserve-env buildah bud $(SQUASH) -f $(PGOROOT)/$(PGO_BASEOS)/Dockerfile.pgo-backrest-restore.$(PGO_BASEOS) -t $(PGO_IMAGE_PREFIX)/pgo-backrest-restore:$(PGO_IMAGE_TAG) $(PGOROOT)
58+
sudo --preserve-env buildah push $(PGO_IMAGE_PREFIX)/pgo-backrest-restore:$(PGO_IMAGE_TAG) docker-daemon:$(PGO_IMAGE_PREFIX)/pgo-backrest-restore:$(PGO_IMAGE_TAG)
59+
docker tag docker.io/$(PGO_IMAGE_PREFIX)/pgo-backrest-restore:$(PGO_IMAGE_TAG) $(PGO_IMAGE_PREFIX)/pgo-backrest-restore:$(PGO_IMAGE_TAG)
7560
pgo-backrest-repo-image: check-go-vars
76-
docker build -t pgo-backrest-repo -f $(PGO_BASEOS)/Dockerfile.pgo-backrest-repo.$(PGO_BASEOS) .
77-
docker tag pgo-backrest-repo $(PGO_IMAGE_PREFIX)/pgo-backrest-repo:$(PGO_IMAGE_TAG)
61+
sudo --preserve-env buildah bud $(SQUASH) -f $(PGOROOT)/$(PGO_BASEOS)/Dockerfile.pgo-backrest-repo.$(PGO_BASEOS) -t $(PGO_IMAGE_PREFIX)/pgo-backrest-repo:$(PGO_IMAGE_TAG) $(PGOROOT)
62+
sudo --preserve-env buildah push $(PGO_IMAGE_PREFIX)/pgo-backrest-repo:$(PGO_IMAGE_TAG) docker-daemon:$(PGO_IMAGE_PREFIX)/pgo-backrest-repo:$(PGO_IMAGE_TAG)
63+
docker tag docker.io/$(PGO_IMAGE_PREFIX)/pgo-backrest-repo:$(PGO_IMAGE_TAG) $(PGO_IMAGE_PREFIX)/pgo-backrest-repo:$(PGO_IMAGE_TAG)
7864
cli-docs: check-go-vars
7965
cd $(PGOROOT)/hugo/content/operatorcli/cli && go run $(PGOROOT)/pgo/generatedocs.go
8066
pgo: check-go-vars
8167
cd pgo && go install pgo.go
8268
clean: check-go-vars
8369
rm -rf $(GOPATH)/pkg/* $(GOBIN)/postgres-operator $(GOBIN)/apiserver $(GOBIN)/*pgo
84-
pgo-apiserver-image: check-go-vars
85-
go install apiserver.go
70+
pgo-apiserver-image: check-go-vars pgo-apiserver
8671
cp $(GOBIN)/apiserver bin/
87-
docker build -t pgo-apiserver -f $(PGO_BASEOS)/Dockerfile.pgo-apiserver.$(PGO_BASEOS) .
88-
docker tag pgo-apiserver $(PGO_IMAGE_PREFIX)/pgo-apiserver:$(PGO_IMAGE_TAG)
89-
# docker push $(PGO_IMAGE_PREFIX)/pgo-apiserver:$(PGO_IMAGE_TAG)
72+
sudo --preserve-env buildah bud $(SQUASH) -f $(PGOROOT)/$(PGO_BASEOS)/Dockerfile.pgo-apiserver.$(PGO_BASEOS) -t $(PGO_IMAGE_PREFIX)/pgo-apiserver:$(PGO_IMAGE_TAG) $(PGOROOT)
73+
sudo --preserve-env buildah push $(PGO_IMAGE_PREFIX)/pgo-apiserver:$(PGO_IMAGE_TAG) docker-daemon:$(PGO_IMAGE_PREFIX)/pgo-apiserver:$(PGO_IMAGE_TAG)
74+
docker tag docker.io/$(PGO_IMAGE_PREFIX)/pgo-apiserver:$(PGO_IMAGE_TAG) $(PGO_IMAGE_PREFIX)/pgo-apiserver:$(PGO_IMAGE_TAG)
75+
9076
postgres-operator: check-go-vars
9177
go install postgres-operator.go
92-
postgres-operator-image: check-go-vars
93-
go install postgres-operator.go
78+
postgres-operator-image: check-go-vars postgres-operator
9479
cp $(GOBIN)/postgres-operator bin/postgres-operator/
95-
docker build -t postgres-operator -f $(PGO_BASEOS)/Dockerfile.postgres-operator.$(PGO_BASEOS) .
96-
docker tag postgres-operator $(PGO_IMAGE_PREFIX)/postgres-operator:$(PGO_IMAGE_TAG)
97-
# docker push $(PGO_IMAGE_PREFIX)/postgres-operator:$(PGO_IMAGE_TAG)
80+
sudo --preserve-env buildah bud $(SQUASH) -f $(PGOROOT)/$(PGO_BASEOS)/Dockerfile.postgres-operator.$(PGO_BASEOS) -t $(PGO_IMAGE_PREFIX)/postgres-operator:$(PGO_IMAGE_TAG) $(PGOROOT)
81+
sudo --preserve-env buildah push $(PGO_IMAGE_PREFIX)/postgres-operator:$(PGO_IMAGE_TAG) docker-daemon:$(PGO_IMAGE_PREFIX)/postgres-operator:$(PGO_IMAGE_TAG)
82+
docker tag docker.io/$(PGO_IMAGE_PREFIX)/postgres-operator:$(PGO_IMAGE_TAG) $(PGO_IMAGE_PREFIX)/postgres-operator:$(PGO_IMAGE_TAG)
9883
deepsix:
9984
cd $(PGOROOT)/apis/cr/v1
10085
deepcopy-gen --go-header-file=$(PGOROOT)/apis/cr/v1/header.go.txt --input-dirs=.
10186
pgo-lspvc-image:
102-
docker build -t pgo-lspvc -f $(PGO_BASEOS)/Dockerfile.pgo-lspvc.$(PGO_BASEOS) .
103-
docker tag pgo-lspvc $(PGO_IMAGE_PREFIX)/pgo-lspvc:$(PGO_IMAGE_TAG)
87+
sudo --preserve-env buildah bud $(SQUASH) -f $(PGOROOT)/$(PGO_BASEOS)/Dockerfile.pgo-lspvc.$(PGO_BASEOS) -t $(PGO_IMAGE_PREFIX)/pgo-lspvc:$(PGO_IMAGE_TAG) $(PGOROOT)
88+
sudo --preserve-env buildah push $(PGO_IMAGE_PREFIX)/pgo-lspvc:$(PGO_IMAGE_TAG) docker-daemon:$(PGO_IMAGE_PREFIX)/pgo-lspvc:$(PGO_IMAGE_TAG)
89+
docker tag docker.io/$(PGO_IMAGE_PREFIX)/pgo-lspvc:$(PGO_IMAGE_TAG) $(PGO_IMAGE_PREFIX)/pgo-lspvc:$(PGO_IMAGE_TAG)
10490
pgo-load-image:
105-
docker build -t pgo-load -f $(PGO_BASEOS)/Dockerfile.pgo-load.$(PGO_BASEOS) .
106-
docker tag pgo-load $(PGO_IMAGE_PREFIX)/pgo-load:$(PGO_IMAGE_TAG)
107-
pgo-rmdata-image:
108-
docker build -t pgo-rmdata -f $(PGO_BASEOS)/Dockerfile.pgo-rmdata.$(PGO_BASEOS) .
109-
docker tag pgo-rmdata $(PGO_IMAGE_PREFIX)/pgo-rmdata:$(PGO_IMAGE_TAG)
91+
sudo --preserve-env buildah bud $(SQUASH) -f $(PGOROOT)/$(PGO_BASEOS)/Dockerfile.pgo-load.$(PGO_BASEOS) -t $(PGO_IMAGE_PREFIX)/pgo-load:$(PGO_IMAGE_TAG) $(PGOROOT)
92+
sudo --preserve-env buildah push $(PGO_IMAGE_PREFIX)/pgo-load:$(PGO_IMAGE_TAG) docker-daemon:$(PGO_IMAGE_PREFIX)/pgo-load:$(PGO_IMAGE_TAG)
93+
docker tag docker.io/$(PGO_IMAGE_PREFIX)/pgo-load:$(PGO_IMAGE_TAG) $(PGO_IMAGE_PREFIX)/pgo-load:$(PGO_IMAGE_TAG)
94+
pgo-rmdata: check-go-vars
95+
go install pgo-rmdata/pgo-rmdata.go
96+
pgo-rmdata-image: check-go-vars pgo-rmdata
97+
cp $(GOBIN)/pgo-rmdata bin/pgo-rmdata/
98+
sudo --preserve-env buildah bud $(SQUASH) -f $(PGOROOT)/$(PGO_BASEOS)/Dockerfile.pgo-rmdata.$(PGO_BASEOS) -t $(PGO_IMAGE_PREFIX)/pgo-rmdata:$(PGO_IMAGE_TAG) $(PGOROOT)
99+
sudo --preserve-env buildah push $(PGO_IMAGE_PREFIX)/pgo-rmdata:$(PGO_IMAGE_TAG) docker-daemon:$(PGO_IMAGE_PREFIX)/pgo-rmdata:$(PGO_IMAGE_TAG)
100+
docker tag docker.io/$(PGO_IMAGE_PREFIX)/pgo-rmdata:$(PGO_IMAGE_TAG) $(PGO_IMAGE_PREFIX)/pgo-rmdata:$(PGO_IMAGE_TAG)
110101
pgo-sqlrunner-image:
111-
docker build -t pgo-sqlrunner -f $(PGO_BASEOS)/Dockerfile.pgo-sqlrunner.$(PGO_BASEOS) .
112-
docker tag pgo-sqlrunner $(PGO_IMAGE_PREFIX)/pgo-sqlrunner:$(PGO_IMAGE_TAG)
113-
pgo-scheduler-image: check-go-vars
102+
sudo --preserve-env buildah bud $(SQUASH) -f $(PGOROOT)/$(PGO_BASEOS)/Dockerfile.pgo-sqlrunner.$(PGO_BASEOS) -t $(PGO_IMAGE_PREFIX)/pgo-sqlrunner:$(PGO_IMAGE_TAG) $(PGOROOT)
103+
sudo --preserve-env buildah push $(PGO_IMAGE_PREFIX)/pgo-sqlrunner:$(PGO_IMAGE_TAG) docker-daemon:$(PGO_IMAGE_PREFIX)/pgo-sqlrunner:$(PGO_IMAGE_TAG)
104+
docker tag docker.io/$(PGO_IMAGE_PREFIX)/pgo-sqlrunner:$(PGO_IMAGE_TAG) $(PGO_IMAGE_PREFIX)/pgo-sqlrunner:$(PGO_IMAGE_TAG)
105+
pgo-scheduler-image: check-go-vars pgo-scheduler
114106
go install pgo-scheduler/pgo-scheduler.go
115107
mv $(GOBIN)/pgo-scheduler ./bin/pgo-scheduler/
116-
docker build -t pgo-scheduler -f $(PGO_BASEOS)/Dockerfile.pgo-scheduler.$(PGO_BASEOS) .
117-
docker tag pgo-scheduler $(PGO_IMAGE_PREFIX)/pgo-scheduler:$(PGO_IMAGE_TAG)
108+
sudo --preserve-env buildah bud $(SQUASH) -f $(PGOROOT)/$(PGO_BASEOS)/Dockerfile.pgo-scheduler.$(PGO_BASEOS) -t $(PGO_IMAGE_PREFIX)/pgo-scheduler:$(PGO_IMAGE_TAG) $(PGOROOT)
109+
sudo --preserve-env buildah push $(PGO_IMAGE_PREFIX)/pgo-scheduler:$(PGO_IMAGE_TAG) docker-daemon:$(PGO_IMAGE_PREFIX)/pgo-scheduler:$(PGO_IMAGE_TAG)
110+
docker tag docker.io/$(PGO_IMAGE_PREFIX)/pgo-scheduler:$(PGO_IMAGE_TAG) $(PGO_IMAGE_PREFIX)/pgo-scheduler:$(PGO_IMAGE_TAG)
111+
118112
all:
119113
make postgres-operator-image
120114
make pgo-apiserver-image
115+
make pgo-event-image
121116
make pgo-scheduler-image
122-
make pgo
123117
make pgo-backrest-repo-image
124-
make pgo-backrest-image
125-
make pgo-rmdata-image
126118
make pgo-backrest-restore-image
119+
make pgo
127120
make pgo-lspvc-image
128121
make pgo-load-image
122+
make pgo-rmdata-image
129123
make pgo-sqlrunner-image
124+
make pgo-backrest-image
130125
push:
131126
docker push $(PGO_IMAGE_PREFIX)/postgres-operator:$(PGO_IMAGE_TAG)
132127
docker push $(PGO_IMAGE_PREFIX)/pgo-apiserver:$(PGO_IMAGE_TAG)
128+
docker push $(PGO_IMAGE_PREFIX)/pgo-event:$(PGO_IMAGE_TAG)
133129
docker push $(PGO_IMAGE_PREFIX)/pgo-backrest-repo:$(PGO_IMAGE_TAG)
134130
docker push $(PGO_IMAGE_PREFIX)/pgo-backrest-restore:$(PGO_IMAGE_TAG)
135131
docker push $(PGO_IMAGE_PREFIX)/pgo-lspvc:$(PGO_IMAGE_TAG)
@@ -141,6 +137,7 @@ push:
141137
pull:
142138
docker pull $(PGO_IMAGE_PREFIX)/postgres-operator:$(PGO_IMAGE_TAG)
143139
docker pull $(PGO_IMAGE_PREFIX)/pgo-apiserver:$(PGO_IMAGE_TAG)
140+
docker push $(PGO_IMAGE_PREFIX)/pgo-event:$(PGO_IMAGE_TAG)
144141
docker pull $(PGO_IMAGE_PREFIX)/pgo-backrest-repo:$(PGO_IMAGE_TAG)
145142
docker pull $(PGO_IMAGE_PREFIX)/pgo-backrest-restore:$(PGO_IMAGE_TAG)
146143
docker pull $(PGO_IMAGE_PREFIX)/pgo-lspvc:$(PGO_IMAGE_TAG)

0 commit comments

Comments
 (0)