Skip to content

Commit 561e389

Browse files
author
Jeff McCormick
committed
Merge branch 'pre25'
2 parents 542dc0d + c02125b commit 561e389

File tree

145 files changed

+2070
-795
lines changed

Some content is hidden

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

145 files changed

+2070
-795
lines changed

‎Makefile‎

Lines changed: 25 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ endif
1313
#======= Main functions =======
1414
macpgo: check-go-vars
1515
cd pgo && env GOOS=darwin GOARCH=amd64 go build pgo.go && mv pgo $(GOBIN)/pgo-mac
16+
env GOOS=darwin GOARCH=amd64 go build github.com/blang/expenv && mv expenv $(GOBIN)/expenv-mac
17+
winpgo: check-go-vars
18+
cd pgo && env GOOS=windows GOARCH=386 go build pgo.go && mv pgo.exe $(GOBIN)/pgo.exe
19+
env GOOS=windows GOARCH=386 go build github.com/blang/expenv && mv expenv.exe $(GOBIN)/expenv.exe
20+
1621

1722
gendeps:
1823
godep save \
@@ -58,23 +63,25 @@ apiserverimage: check-go-vars
5863
go install apiserver.go
5964
cp $(GOBIN)/apiserver bin/
6065
docker build -t pgo-apiserver -f $(CO_BASEOS)/Dockerfile.pgo-apiserver.$(CO_BASEOS) .
61-
docker tag pgo-apiserver crunchydata/pgo-apiserver:$(CO_BASEOS)-$(CO_VERSION)
66+
docker tag pgo-apiserver $(CO_IMAGE_PREFIX)/pgo-apiserver:$(CO_BASEOS)-$(CO_VERSION)
67+
# docker push $(CO_IMAGE_PREFIX)/pgo-apiserver:$(CO_IMAGE_TAG)
6268
postgres-operator: check-go-vars
6369
go install postgres-operator.go
6470
operatorimage: check-go-vars
6571
go install postgres-operator.go
6672
cp $(GOBIN)/postgres-operator bin/postgres-operator/
6773
docker build -t postgres-operator -f $(CO_BASEOS)/Dockerfile.postgres-operator.$(CO_BASEOS) .
68-
docker tag postgres-operator crunchydata/postgres-operator:$(CO_BASEOS)-$(CO_VERSION)
74+
docker tag postgres-operator $(CO_IMAGE_PREFIX)/postgres-operator:$(CO_BASEOS)-$(CO_VERSION)
75+
# docker push $(CO_IMAGE_PREFIX)/postgres-operator:$(CO_IMAGE_TAG)
6976
lsimage:
7077
docker build -t pgo-lspvc -f $(CO_BASEOS)/Dockerfile.pgo-lspvc.$(CO_BASEOS) .
71-
docker tag pgo-lspvc crunchydata/pgo-lspvc:$(CO_BASEOS)-$(CO_VERSION)
78+
docker tag pgo-lspvc $(CO_IMAGE_PREFIX)/pgo-lspvc:$(CO_BASEOS)-$(CO_VERSION)
7279
loadimage:
7380
docker build -t pgo-load -f $(CO_BASEOS)/Dockerfile.pgo-load.$(CO_BASEOS) .
74-
docker tag pgo-load crunchydata/pgo-load:$(CO_BASEOS)-$(CO_VERSION)
81+
docker tag pgo-load $(CO_IMAGE_PREFIX)/pgo-load:$(CO_BASEOS)-$(CO_VERSION)
7582
rmdataimage:
7683
docker build -t pgo-rmdata -f $(CO_BASEOS)/Dockerfile.pgo-rmdata.$(CO_BASEOS) .
77-
docker tag pgo-rmdata crunchydata/pgo-rmdata:$(CO_BASEOS)-$(CO_VERSION)
84+
docker tag pgo-rmdata $(CO_IMAGE_PREFIX)/pgo-rmdata:$(CO_BASEOS)-$(CO_VERSION)
7885
all:
7986
make operatorimage
8087
make apiserverimage
@@ -83,17 +90,25 @@ all:
8390
make pgo
8491
make rmdataimage
8592
push:
86-
docker push crunchydata/pgo-lspvc:$(CO_IMAGE_TAG)
87-
docker push crunchydata/pgo-rmdata:$(CO_IMAGE_TAG)
88-
docker push crunchydata/pgo-load:$(CO_IMAGE_TAG)
89-
docker push crunchydata/postgres-operator:$(CO_IMAGE_TAG)
90-
docker push crunchydata/pgo-apiserver:$(CO_IMAGE_TAG)
93+
docker push $(CO_IMAGE_PREFIX)/pgo-lspvc:$(CO_IMAGE_TAG)
94+
docker push $(CO_IMAGE_PREFIX)/pgo-rmdata:$(CO_IMAGE_TAG)
95+
docker push $(CO_IMAGE_PREFIX)/pgo-load:$(CO_IMAGE_TAG)
96+
docker push $(CO_IMAGE_PREFIX)/postgres-operator:$(CO_IMAGE_TAG)
97+
docker push $(CO_IMAGE_PREFIX)/pgo-apiserver:$(CO_IMAGE_TAG)
9198
release: check-go-vars
9299
make macpgo
100+
make winpgo
93101
rm -rf $(RELTMPDIR) $(RELFILE)
94102
mkdir $(RELTMPDIR)
103+
cp -r $(COROOT)/examples $(RELTMPDIR)
104+
cp -r $(COROOT)/deploy $(RELTMPDIR)
105+
cp -r $(COROOT)/conf $(RELTMPDIR)
95106
cp $(GOBIN)/pgo $(RELTMPDIR)
96107
cp $(GOBIN)/pgo-mac $(RELTMPDIR)
108+
cp $(GOBIN)/pgo.exe $(RELTMPDIR)
109+
cp $(GOBIN)/expenv $(RELTMPDIR)
110+
cp $(GOBIN)/expenv-mac $(RELTMPDIR)
111+
cp $(GOBIN)/expenv.exe $(RELTMPDIR)
97112
cp $(COROOT)/examples/pgo-bash-completion $(RELTMPDIR)
98113
tar czvf $(RELFILE) -C $(RELTMPDIR) .
99114
default:

‎README.asciidoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
= PostgreSQL Operator
22
:toc:
3-
v2.4, {docdate}
3+
v2.5, {docdate}
44

55
== Overview
66

‎apis/cr/v1/backup.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package v1
22

33
/*
4-
Copyright 2017 Crunchy Data Solutions, Inc.
4+
Copyright 2018 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

‎apis/cr/v1/cluster.go‎

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

33
/*
4-
Copyright 2017 Crunchy Data Solutions, Inc.
4+
Copyright 2018 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
@@ -57,6 +57,7 @@ type PgclusterSpec struct {
5757
PrimarySecretName string `json:"primarysecretname"`
5858
Status string `json:"status"`
5959
PswLastUpdate string `json:"pswlastupdate"`
60+
CustomConfig string `json:"customconfig"`
6061
UserLabels map[string]string `json:"userlabels"`
6162
}
6263

‎apis/cr/v1/common.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package v1
22

33
/*
4-
Copyright 2017 Crunchy Data Solutions, Inc.
4+
Copyright 2018 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

‎apis/cr/v1/doc.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package v1
33
// +k8s:deepcopy-gen=package,register
44

55
/*
6-
Copyright 2017 Crunchy Data Solutions, Inc.
6+
Copyright 2018 Crunchy Data Solutions, Inc.
77
Licensed under the Apache License, Version 2.0 (the "License");
88
you may not use this file except in compliance with the License.
99
You may obtain a copy of the License at
@@ -16,4 +16,3 @@ package v1
1616
See the License for the specific language governing permissions and
1717
limitations under the License.
1818
*/
19-

‎apis/cr/v1/policy.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package v1
22

33
/*
4-
Copyright 2017 Crunchy Data Solutions, Inc.
4+
Copyright 2018 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

‎apis/cr/v1/register.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package v1
22

33
/*
4-
Copyright 2017 The Kubernetes Authors.
4+
Copyright 2018 Crunchy Data Solutions, Inc.
55
66
Licensed under the Apache License, Version 2.0 (the "License");
77
you may not use this file except in compliance with the License.

‎apis/cr/v1/task.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package v1
22

33
/*
4-
Copyright 2017 Crunchy Data Solutions, Inc.
4+
Copyright 2018 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

‎apis/cr/v1/upgrade.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package v1
22

33
/*
4-
Copyright 2017 Crunchy Data Solutions, Inc.
4+
Copyright 2018 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

0 commit comments

Comments
 (0)