Skip to content

Commit 46e9616

Browse files
author
Jeff McCormick
committed
update docs and remove cruft in makefile
1 parent b51d69d commit 46e9616

File tree

2 files changed

+34
-24
lines changed

2 files changed

+34
-24
lines changed

Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ release: check-go-vars
6363
cp $(GOBIN)/pgo $(RELTMPDIR)
6464
cp $(GOBIN)/pgo-mac $(RELTMPDIR)
6565
cp $(COROOT)/examples/pgo-bash-completion $(RELTMPDIR)
66-
cp -r $(COROOT)/conf/ $(RELTMPDIR)
6766
tar czvf $(RELFILE) -C $(RELTMPDIR) .
6867
default:
6968
all

docs/build.asciidoc

Lines changed: 34 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,8 @@ kubectl get namespaces
185185
....
186186
then set your context to the new demo namespace
187187
....
188+
sudo chmod o+w /etc/kubernetes
189+
sudo chmod o+w /etc/kubernetes/admin.conf
188190
kubectl config set-context demo --namespace=demo --cluster=kubernetes --user=kubernetes-admin
189191
kubectl config use-context demo
190192
kubectl config current-context
@@ -299,6 +301,11 @@ your storage configuration. Adjust this file for NFS or other storage configura
299301
Note that the *pgo.yaml* configuration file assumes your Kubernetes configuration file is located in */etc/kubernetes/admin.conf*. Update this kubeconfig
300302
path to match your local Kubernetes configuration file location.
301303

304+
The version of PostgreSQL container the Operator will deploy is determined
305+
by the *CCPImageTag* setting in the *$COROOT/conf/apiserver/pgo.yaml*
306+
configuration file. By default, this value is set to the latest
307+
release of the Crunchy Container Suite.
308+
302309
More in-depth explanations of postgres operator configurations are available
303310
in the link:config.asciidoc[Configuration] document.
304311

@@ -321,28 +328,6 @@ kubectl get crd
321328

322329
Strategies for deploying the operator can be found in the link:design.asciidoc[PostgreSQL Operator Design] document.
323330

324-
=== Makefile Targets
325-
326-
The following table describes the Makefile targets:
327-
.Makefile Targets
328-
[width="40%",frame="topbot",options="header,footer"]
329-
|======================
330-
|Target | Description
331-
|all | compile all binaries and build all images
332-
|setup | fetch the dependent packages required to build with
333-
|deployoperator | deploy the Operator (apiserver and postgers-operator) to Kubernetes
334-
|main | compile the postgres-operator
335-
|runmain | locally execute the postgres-operator
336-
|pgo | build the pgo binary
337-
|runpgo | run the pgo binary
338-
|runapiserver | run the apiserver binary outside of Kube
339-
|clean | remove binaries and compiled packages, restore dependencies
340-
|operatorimage | compile and build the postgres-operator Docker image
341-
|apiserverimage | compile and build the apiserver Docker image
342-
|lsimage | build the lspvc Docker image
343-
|csvloadimage | build the csvload Docker image
344-
|release | build the postgres-operator release
345-
|======================
346331

347332
=== Verify Installation
348333

@@ -360,7 +345,10 @@ kubectl get pgpolicies
360345
kubectl get pgpolicylogs
361346
....
362347

363-
At this point, you should be ready to start using the *pgo* client!
348+
At this point, you should be ready to start using the *pgo* client! Be
349+
sure to set the environment variable *CO_APISERVER_URL* to the DNS
350+
name of the *postgres-operator* service or to the IP address of the
351+
*postgres-operator* service IP address.
364352

365353
== Performing a Smoke Test
366354

@@ -397,3 +385,26 @@ the following:
397385
* delete an entire project (*pgo delete cluster --selector=project=xray*)
398386

399387
More detailed explanations of the commands can be found in the link:user-guide.asciidoc[User Guide].
388+
389+
=== Makefile Targets
390+
391+
The following table describes the Makefile targets:
392+
.Makefile Targets
393+
[width="40%",frame="topbot",options="header,footer"]
394+
|======================
395+
|Target | Description
396+
|all | compile all binaries and build all images
397+
|setup | fetch the dependent packages required to build with
398+
|deployoperator | deploy the Operator (apiserver and postgers-operator) to Kubernetes
399+
|main | compile the postgres-operator
400+
|runmain | locally execute the postgres-operator
401+
|pgo | build the pgo binary
402+
|runpgo | run the pgo binary
403+
|runapiserver | run the apiserver binary outside of Kube
404+
|clean | remove binaries and compiled packages, restore dependencies
405+
|operatorimage | compile and build the postgres-operator Docker image
406+
|apiserverimage | compile and build the apiserver Docker image
407+
|lsimage | build the lspvc Docker image
408+
|csvloadimage | build the csvload Docker image
409+
|release | build the postgres-operator release
410+
|======================

0 commit comments

Comments
 (0)