Skip to content

Commit 49df6de

Browse files
jmccormick2001jmccormick2001
authored
Merge branch 'develop' into cdave-operator
2 parents 2aecc30 + 89b7039 commit 49df6de

File tree

924 files changed

+109107
-7895
lines changed

Some content is hidden

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

924 files changed

+109107
-7895
lines changed

‎Godeps/Godeps.json

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

‎Godeps/Readme

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

‎Makefile

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,17 @@ gendeps:
4343
github.com/crunchydata/postgres-operator/apiserver/userservice \
4444
github.com/crunchydata/postgres-operator/apiserver/util \
4545
github.com/crunchydata/postgres-operator/apiserver/versionservice
46+
installrbac:
47+
cd deploy && ./install-rbac.sh
4648
setup:
4749
./bin/get-deps.sh
50+
cd examples/backrest-config && ./create.sh
51+
setupnamespace:
52+
kubectl create -f ./examples/demo-namespace.json
53+
kubectl config set-context demo --cluster=kubernetes --namespace=demo --user=kubernetes-admin
54+
kubectl config use-context demo
55+
bounce:
56+
kubectl get pod --selector=name=postgres-operator -o=jsonpath="{.items[0].metadata.name}" | xargs kubectl delete pod
4857
deployoperator:
4958
cd deploy && ./deploy.sh
5059
main: check-go-vars
@@ -55,6 +64,12 @@ runapiserver: check-go-vars
5564
apiserver --kubeconfig=/etc/kubernetes/admin.conf
5665
apiserver: check-go-vars
5766
go install apiserver.go
67+
pgo-backrest: check-go-vars
68+
go install pgo-backrest/pgo-backrest.go
69+
mv $(GOBIN)/pgo-backrest ./bin/pgo-backrest/
70+
pgo-backrest-image: check-go-vars pgo-backrest
71+
docker build -t pgo-backrest -f $(CO_BASEOS)/Dockerfile.pgo-backrest.$(CO_BASEOS) .
72+
docker tag pgo-backrest $(CO_IMAGE_PREFIX)/pgo-backrest:$(CO_IMAGE_TAG)
5873
pgo: check-go-vars
5974
cd pgo && go install pgo.go
6075
clean: check-go-vars
@@ -63,41 +78,43 @@ apiserverimage: check-go-vars
6378
go install apiserver.go
6479
cp $(GOBIN)/apiserver bin/
6580
docker build -t pgo-apiserver -f $(CO_BASEOS)/Dockerfile.pgo-apiserver.$(CO_BASEOS) .
66-
docker tag pgo-apiserver $(CO_IMAGE_PREFIX)/pgo-apiserver:$(CO_BASEOS)-$(CO_VERSION)
81+
docker tag pgo-apiserver $(CO_IMAGE_PREFIX)/pgo-apiserver:$(CO_IMAGE_TAG)
6782
# docker push $(CO_IMAGE_PREFIX)/pgo-apiserver:$(CO_IMAGE_TAG)
6883
operator: check-go-vars
6984
go install postgres-operator.go
7085
operatorimage: check-go-vars
7186
go install postgres-operator.go
7287
cp $(GOBIN)/postgres-operator bin/postgres-operator/
7388
docker build -t postgres-operator -f $(CO_BASEOS)/Dockerfile.postgres-operator.$(CO_BASEOS) .
74-
docker tag postgres-operator $(CO_IMAGE_PREFIX)/postgres-operator:$(CO_BASEOS)-$(CO_VERSION)
89+
docker tag postgres-operator $(CO_IMAGE_PREFIX)/postgres-operator:$(CO_IMAGE_TAG)
7590
# docker push $(CO_IMAGE_PREFIX)/postgres-operator:$(CO_IMAGE_TAG)
7691
deepsix:
7792
cd $(COROOT)/apis/cr/v1
7893
deepcopy-gen --go-header-file=$(COROOT)/apis/cr/v1/header.go.txt --input-dirs=.
7994
lsimage:
8095
docker build -t pgo-lspvc -f $(CO_BASEOS)/Dockerfile.pgo-lspvc.$(CO_BASEOS) .
81-
docker tag pgo-lspvc $(CO_IMAGE_PREFIX)/pgo-lspvc:$(CO_BASEOS)-$(CO_VERSION)
96+
docker tag pgo-lspvc $(CO_IMAGE_PREFIX)/pgo-lspvc:$(CO_IMAGE_TAG)
8297
loadimage:
8398
docker build -t pgo-load -f $(CO_BASEOS)/Dockerfile.pgo-load.$(CO_BASEOS) .
84-
docker tag pgo-load $(CO_IMAGE_PREFIX)/pgo-load:$(CO_BASEOS)-$(CO_VERSION)
99+
docker tag pgo-load $(CO_IMAGE_PREFIX)/pgo-load:$(CO_IMAGE_TAG)
85100
rmdataimage:
86101
docker build -t pgo-rmdata -f $(CO_BASEOS)/Dockerfile.pgo-rmdata.$(CO_BASEOS) .
87-
docker tag pgo-rmdata $(CO_IMAGE_PREFIX)/pgo-rmdata:$(CO_BASEOS)-$(CO_VERSION)
102+
docker tag pgo-rmdata $(CO_IMAGE_PREFIX)/pgo-rmdata:$(CO_IMAGE_TAG)
88103
all:
89104
make operatorimage
90105
make apiserverimage
91106
make lsimage
92107
make loadimage
93108
make pgo
94109
make rmdataimage
110+
make pgo-backrest-image
95111
push:
96112
docker push $(CO_IMAGE_PREFIX)/pgo-lspvc:$(CO_IMAGE_TAG)
97113
docker push $(CO_IMAGE_PREFIX)/pgo-rmdata:$(CO_IMAGE_TAG)
98114
docker push $(CO_IMAGE_PREFIX)/pgo-load:$(CO_IMAGE_TAG)
99115
docker push $(CO_IMAGE_PREFIX)/postgres-operator:$(CO_IMAGE_TAG)
100116
docker push $(CO_IMAGE_PREFIX)/pgo-apiserver:$(CO_IMAGE_TAG)
117+
docker push $(CO_IMAGE_PREFIX)/pgo-backrest:$(CO_IMAGE_TAG)
101118
pull:
102119
docker pull $(CO_IMAGE_PREFIX)/pgo-lspvc:$(CO_IMAGE_TAG)
103120
docker pull $(CO_IMAGE_PREFIX)/pgo-rmdata:$(CO_IMAGE_TAG)

‎README.adoc

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
++++
2+
<h1 align="center">Crunchy Data PostgreSQL Operator</h1>
3+
<p align="center">
4+
<img width="150" src="crunchy_logo.png?raw=true"/>
5+
</p>
6+
++++
7+
8+
Latest Release: 3.2.0 {docdate}
9+
10+
== General
11+
12+
The *postgres-operator* is a controller that runs within a Kubernetes cluster that provides a means to deploy and manage PostgreSQL clusters.
13+
14+
Please view the official Crunchy Data PostgreSQL Operator documentation link:https://crunchydata.github.io/postgres-operator/[here]. If you are
15+
interested in contributing or making an update to the documentation, please view the link:https://crunchydata.github.io/postgres-operator/contributing/[Contributing Guidelines].
16+
17+
[link=https://crunchydata.github.io/postgres-operator/]
18+
image::btn.png[Official Documentation]
19+
20+
== Installation
21+
22+
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.
23+
24+
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.
25+
26+
More design information is found on the link:https://crunchydata.github.io/postgres-operator/how-it-works/[How It Works] page.
27+
28+
== Configuration
29+
30+
The operator is template-driven; this makes it simple to configure both the client and the operator. The configuration options are documented on the link:https://crunchydata.github.io/postgres-operator/installation/configuration/[Configuration] page.
31+
32+
== Getting Started
33+
34+
*postgres-operator* commands are documented on the link:https://crunchydata.github.io/postgres-operator/getting-started/[Getting Started] page.

‎README.asciidoc

Lines changed: 0 additions & 55 deletions
This file was deleted.

‎apis/cr/v1/backup.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ type PgbackupSpec struct {
3232
BackupPass string `json:"backuppass"`
3333
BackupPort string `json:"backupport"`
3434
BackupStatus string `json:"backupstatus"`
35+
BackupPVC string `json:"backuppvc"`
3536
}
3637

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

‎apis/cr/v1/common.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ type PgStorageSpec struct {
4747
StorageType string `json:"storagetype"`
4848
Fsgroup string `json:"fsgroup"`
4949
SupplementalGroups string `json:"supplementalgroups"`
50+
MatchLabels string `json:"matchLabels"`
5051
}
5152

5253
// PgContainerResource ...

0 commit comments

Comments
 (0)