Skip to content

Commit 7fb5f61

Browse files
author
jmccormick2001
committed
fix merge conflict in examples/env.sh
2 parents 7e867eb + 65a75e0 commit 7fb5f61

File tree

693 files changed

+31414
-7851
lines changed

Some content is hidden

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

693 files changed

+31414
-7851
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
public
2+
.DS_Store

‎Gopkg.lock‎

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

‎Makefile‎

Lines changed: 62 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
RELTMPDIR=/tmp/release.$(CO_VERSION)
2-
HELMTMPDIR=/tmp/helm-release.$(CO_VERSION)
3-
RELFILE=/tmp/postgres-operator.$(CO_VERSION).tar.gz
4-
HELMRELFILE=/tmp/postgres-operator-helm-chart.$(CO_VERSION).tar.gz
1+
RELTMPDIR=/tmp/release.$(PGO_VERSION)
2+
RELFILE=/tmp/postgres-operator.$(PGO_VERSION).tar.gz
53

64
#======= Safety checks =======
75
check-go-vars:
@@ -49,12 +47,12 @@ installrbac:
4947
cd deploy && ./install-rbac.sh
5048
setup:
5149
./bin/get-deps.sh
52-
setupnamespace:
53-
kubectl create -f ./examples/demo-namespace.json
54-
kubectl config set-context demo --cluster=kubernetes --namespace=demo --user=kubernetes-admin
55-
kubectl config use-context demo
50+
setupnamespaces:
51+
cd deploy && ./setupnamespaces.sh
52+
cleannamespaces:
53+
cd deploy && ./cleannamespaces.sh
5654
bounce:
57-
kubectl get pod --selector=name=postgres-operator -o=jsonpath="{.items[0].metadata.name}" | xargs kubectl delete pod
55+
$(PGO_CMD) --namespace=$(PGO_OPERATOR_NAMESPACE) get pod --selector=name=postgres-operator -o=jsonpath="{.items[0].metadata.name}" | xargs $(PGO_CMD) --namespace=$(PGO_OPERATOR_NAMESPACE) delete pod
5856
deployoperator:
5957
cd deploy && ./deploy.sh
6058
main: check-go-vars
@@ -69,106 +67,104 @@ pgo-backrest: check-go-vars
6967
go install pgo-backrest/pgo-backrest.go
7068
mv $(GOBIN)/pgo-backrest ./bin/pgo-backrest/
7169
pgo-backrest-image: check-go-vars pgo-backrest
72-
docker build -t pgo-backrest -f $(CO_BASEOS)/Dockerfile.pgo-backrest.$(CO_BASEOS) .
73-
docker tag pgo-backrest $(CO_IMAGE_PREFIX)/pgo-backrest:$(CO_IMAGE_TAG)
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)
7472
pgo-backrest-restore-image: check-go-vars
75-
docker build -t pgo-backrest-restore -f $(CO_BASEOS)/Dockerfile.pgo-backrest-restore.$(CO_BASEOS) .
76-
docker tag pgo-backrest-restore $(CO_IMAGE_PREFIX)/pgo-backrest-restore:$(CO_IMAGE_TAG)
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)
7775
pgo-backrest-repo-image: check-go-vars
78-
docker build -t pgo-backrest-repo -f $(CO_BASEOS)/Dockerfile.pgo-backrest-repo.$(CO_BASEOS) .
79-
docker tag pgo-backrest-repo $(CO_IMAGE_PREFIX)/pgo-backrest-repo:$(CO_IMAGE_TAG)
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)
8078
cli-docs: check-go-vars
81-
cd $(COROOT)/hugo/content/cli && go run $(COROOT)/pgo/generatedocs.go
79+
cd $(PGOROOT)/hugo/content/operatorcli/cli && go run $(PGOROOT)/pgo/generatedocs.go
8280
pgo: check-go-vars
8381
cd pgo && go install pgo.go
8482
clean: check-go-vars
8583
rm -rf $(GOPATH)/pkg/* $(GOBIN)/postgres-operator $(GOBIN)/apiserver $(GOBIN)/*pgo
8684
pgo-apiserver-image: check-go-vars
8785
go install apiserver.go
8886
cp $(GOBIN)/apiserver bin/
89-
docker build -t pgo-apiserver -f $(CO_BASEOS)/Dockerfile.pgo-apiserver.$(CO_BASEOS) .
90-
docker tag pgo-apiserver $(CO_IMAGE_PREFIX)/pgo-apiserver:$(CO_IMAGE_TAG)
91-
# docker push $(CO_IMAGE_PREFIX)/pgo-apiserver:$(CO_IMAGE_TAG)
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)
9290
postgres-operator: check-go-vars
9391
go install postgres-operator.go
9492
postgres-operator-image: check-go-vars
9593
go install postgres-operator.go
9694
cp $(GOBIN)/postgres-operator bin/postgres-operator/
97-
docker build -t postgres-operator -f $(CO_BASEOS)/Dockerfile.postgres-operator.$(CO_BASEOS) .
98-
docker tag postgres-operator $(CO_IMAGE_PREFIX)/postgres-operator:$(CO_IMAGE_TAG)
99-
# docker push $(CO_IMAGE_PREFIX)/postgres-operator:$(CO_IMAGE_TAG)
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)
10098
deepsix:
101-
cd $(COROOT)/apis/cr/v1
102-
deepcopy-gen --go-header-file=$(COROOT)/apis/cr/v1/header.go.txt --input-dirs=.
99+
cd $(PGOROOT)/apis/cr/v1
100+
deepcopy-gen --go-header-file=$(PGOROOT)/apis/cr/v1/header.go.txt --input-dirs=.
103101
pgo-lspvc-image:
104-
docker build -t pgo-lspvc -f $(CO_BASEOS)/Dockerfile.pgo-lspvc.$(CO_BASEOS) .
105-
docker tag pgo-lspvc $(CO_IMAGE_PREFIX)/pgo-lspvc:$(CO_IMAGE_TAG)
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)
106104
pgo-load-image:
107-
docker build -t pgo-load -f $(CO_BASEOS)/Dockerfile.pgo-load.$(CO_BASEOS) .
108-
docker tag pgo-load $(CO_IMAGE_PREFIX)/pgo-load:$(CO_IMAGE_TAG)
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)
109107
pgo-rmdata-image:
110-
docker build -t pgo-rmdata -f $(CO_BASEOS)/Dockerfile.pgo-rmdata.$(CO_BASEOS) .
111-
docker tag pgo-rmdata $(CO_IMAGE_PREFIX)/pgo-rmdata:$(CO_IMAGE_TAG)
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)
112110
pgo-sqlrunner-image:
113-
docker build -t pgo-sqlrunner -f $(CO_BASEOS)/Dockerfile.pgo-sqlrunner.$(CO_BASEOS) .
114-
docker tag pgo-sqlrunner $(CO_IMAGE_PREFIX)/pgo-sqlrunner:$(CO_IMAGE_TAG)
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)
115113
pgo-scheduler-image: check-go-vars
116114
go install pgo-scheduler/pgo-scheduler.go
117115
mv $(GOBIN)/pgo-scheduler ./bin/pgo-scheduler/
118-
docker build -t pgo-scheduler -f $(CO_BASEOS)/Dockerfile.pgo-scheduler.$(CO_BASEOS) .
119-
docker tag pgo-scheduler $(CO_IMAGE_PREFIX)/pgo-scheduler:$(CO_IMAGE_TAG)
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)
120118
all:
121119
make postgres-operator-image
122120
make pgo-apiserver-image
121+
make pgo-scheduler-image
122+
make pgo
123123
make pgo-backrest-repo-image
124+
make pgo-backrest-image
125+
make pgo-rmdata-image
124126
make pgo-backrest-restore-image
125-
make pgo
126127
make pgo-lspvc-image
127128
make pgo-load-image
128-
make pgo-rmdata-image
129129
make pgo-sqlrunner-image
130-
make pgo-backrest-image
131-
make pgo-scheduler-image
132130
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)
137-
docker push $(CO_IMAGE_PREFIX)/pgo-lspvc:$(CO_IMAGE_TAG)
138-
docker push $(CO_IMAGE_PREFIX)/pgo-load:$(CO_IMAGE_TAG)
139-
docker push $(CO_IMAGE_PREFIX)/pgo-rmdata:$(CO_IMAGE_TAG)
140-
docker push $(CO_IMAGE_PREFIX)/pgo-sqlrunner:$(CO_IMAGE_TAG)
141-
docker push $(CO_IMAGE_PREFIX)/pgo-backrest:$(CO_IMAGE_TAG)
142-
docker push $(CO_IMAGE_PREFIX)/pgo-scheduler:$(CO_IMAGE_TAG)
131+
docker push $(PGO_IMAGE_PREFIX)/postgres-operator:$(PGO_IMAGE_TAG)
132+
docker push $(PGO_IMAGE_PREFIX)/pgo-apiserver:$(PGO_IMAGE_TAG)
133+
docker push $(PGO_IMAGE_PREFIX)/pgo-backrest-repo:$(PGO_IMAGE_TAG)
134+
docker push $(PGO_IMAGE_PREFIX)/pgo-backrest-restore:$(PGO_IMAGE_TAG)
135+
docker push $(PGO_IMAGE_PREFIX)/pgo-lspvc:$(PGO_IMAGE_TAG)
136+
docker push $(PGO_IMAGE_PREFIX)/pgo-load:$(PGO_IMAGE_TAG)
137+
docker push $(PGO_IMAGE_PREFIX)/pgo-rmdata:$(PGO_IMAGE_TAG)
138+
docker push $(PGO_IMAGE_PREFIX)/pgo-sqlrunner:$(PGO_IMAGE_TAG)
139+
docker push $(PGO_IMAGE_PREFIX)/pgo-backrest:$(PGO_IMAGE_TAG)
140+
docker push $(PGO_IMAGE_PREFIX)/pgo-scheduler:$(PGO_IMAGE_TAG)
143141
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)
148-
docker pull $(CO_IMAGE_PREFIX)/pgo-lspvc:$(CO_IMAGE_TAG)
149-
docker pull $(CO_IMAGE_PREFIX)/pgo-load:$(CO_IMAGE_TAG)
150-
docker pull $(CO_IMAGE_PREFIX)/pgo-rmdata:$(CO_IMAGE_TAG)
151-
docker pull $(CO_IMAGE_PREFIX)/pgo-sqlrunner:$(CO_IMAGE_TAG)
152-
docker pull $(CO_IMAGE_PREFIX)/pgo-backrest:$(CO_IMAGE_TAG)
153-
docker pull $(CO_IMAGE_PREFIX)/pgo-scheduler:$(CO_IMAGE_TAG)
142+
docker pull $(PGO_IMAGE_PREFIX)/postgres-operator:$(PGO_IMAGE_TAG)
143+
docker pull $(PGO_IMAGE_PREFIX)/pgo-apiserver:$(PGO_IMAGE_TAG)
144+
docker pull $(PGO_IMAGE_PREFIX)/pgo-backrest-repo:$(PGO_IMAGE_TAG)
145+
docker pull $(PGO_IMAGE_PREFIX)/pgo-backrest-restore:$(PGO_IMAGE_TAG)
146+
docker pull $(PGO_IMAGE_PREFIX)/pgo-lspvc:$(PGO_IMAGE_TAG)
147+
docker pull $(PGO_IMAGE_PREFIX)/pgo-load:$(PGO_IMAGE_TAG)
148+
docker pull $(PGO_IMAGE_PREFIX)/pgo-rmdata:$(PGO_IMAGE_TAG)
149+
docker pull $(PGO_IMAGE_PREFIX)/pgo-sqlrunner:$(PGO_IMAGE_TAG)
150+
docker pull $(PGO_IMAGE_PREFIX)/pgo-backrest:$(PGO_IMAGE_TAG)
151+
docker pull $(PGO_IMAGE_PREFIX)/pgo-scheduler:$(PGO_IMAGE_TAG)
154152
release: check-go-vars
155153
make macpgo
156154
make winpgo
157-
rm -rf $(RELTMPDIR) $(RELFILE) $(HELMTMPDIR)
158-
mkdir $(RELTMPDIR) $(HELMTMPDIR)
159-
cp -r $(COROOT)/examples $(RELTMPDIR)
160-
cp -r $(COROOT)/deploy $(RELTMPDIR)
161-
cp -r $(COROOT)/conf $(RELTMPDIR)
162-
cp -r $(COROOT)/chart $(HELMTMPDIR)
155+
rm -rf $(RELTMPDIR) $(RELFILE)
156+
mkdir $(RELTMPDIR)
157+
cp -r $(PGOROOT)/examples $(RELTMPDIR)
158+
cp -r $(PGOROOT)/deploy $(RELTMPDIR)
159+
cp -r $(PGOROOT)/conf $(RELTMPDIR)
163160
cp $(GOBIN)/pgo $(RELTMPDIR)
164161
cp $(GOBIN)/pgo-mac $(RELTMPDIR)
165162
cp $(GOBIN)/pgo.exe $(RELTMPDIR)
166163
cp $(GOBIN)/expenv $(RELTMPDIR)
167164
cp $(GOBIN)/expenv-mac $(RELTMPDIR)
168165
cp $(GOBIN)/expenv.exe $(RELTMPDIR)
169-
cp $(COROOT)/examples/pgo-bash-completion $(RELTMPDIR)
166+
cp $(PGOROOT)/examples/pgo-bash-completion $(RELTMPDIR)
170167
tar czvf $(RELFILE) -C $(RELTMPDIR) .
171-
tar czvf $(HELMRELFILE) -C $(HELMTMPDIR) .
172168
default:
173169
all
174170

0 commit comments

Comments
 (0)