Skip to content

Some minor tweaks for asciidoc conformity. #173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jmccormick2001 merged 3 commits into from
Apr 6, 2018
Merged

Some minor tweaks for asciidoc conformity. #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a6ab7fb
Some minor tweaks for asciidoc conformity.
cmwshang Apr 5, 2018
dbb1456
Merge branch 'master' of github.com:CrunchyData/postgres-operator
cmwshang Apr 6, 2018
84ea16d
Fixed level issue reported by asciidoc: build.asciidoc: line 49: sect…
cmwshang Apr 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions docs/build.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ cd $COROOT
make setup
....

==== Compiling the PostgreSQL Operator
=== Compiling the PostgreSQL Operator
....
cd $COROOT
make all
Expand Down Expand Up @@ -163,7 +163,7 @@ export CO_APISERVER_URL=https://postgres-operator.demo.svc.cluster.local:8443

The following table describes the Makefile targets:
.Makefile Targets
[width="80%",frame="topbot",options="header,footer"]
[width="80%",frame="topbot",options="header"]
|======================
|Target | Description
|all | compile all binaries and build all images
Expand All @@ -182,5 +182,3 @@ The following table describes the Makefile targets:
|rmdataimage | build the data deletion Docker image
|release | build the postgres-operator release
|======================


1 change: 1 addition & 0 deletions docs/commands.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -545,6 +545,7 @@ The load configuration file has the following YAML attributes:
.Load Configuration File Definitions
[width="90%",cols="m,2",frame="topbot",options="header"]
|======================
|Attribute | Description
|COImagePrefix| the pgo-load image prefix to use for the load job
|COImageTag| the pgo-load image tag to use for the load job
|DbDatabase| the database schema to use for loading the data
Expand Down
2 changes: 1 addition & 1 deletion docs/configuration.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ readonlyuser:testpass:pgoreader

The following list shows the current *pgo* permissions:
.pgo Permissions
[width="60%",frame="topbot",options="header,footer"]
[width="60%",frame="topbot",options="header"]
|======================
|Permission | Description
|ShowCluster | allow *pgo show cluster*
Expand Down
20 changes: 9 additions & 11 deletions docs/design.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
:toc:
v2.6, {docdate}


image::crunchy_logo.png?raw=true[]

== Reference Architecture

So, what does the Postgres Operator actually deploy
Expand Down Expand Up @@ -127,7 +124,7 @@ kubectl get pod -o wide
....

When you scale up a Cluster and add a replica, the scaling will
take into account the use of "--node-name". If it sees that a
take into account the use of ``--node-name''. If it sees that a
cluster was created with a specific node name, then the replica
Deployment will add an affinity rule to attempt to schedule
the replica on a different node than the node the primary is
Expand Down Expand Up @@ -212,13 +209,14 @@ that gets mounted into */operator-conf* within the operator pod.
The directory structure of the strategy templates is as
follows:
....
├── backup-job.json
├── cluster
│   └── 1
│   ├── cluster-deployment-1.json
│   ├── cluster-replica-deployment-1.json
│   └── cluster-service-1.json
├── pvc.json
|-- backup-job.json
|-- cluster
| |-- 1
| |-- cluster-deployment-1.json
| |-- cluster-replica-deployment-1.json
| |-- cluster-service-1.json
|
|-- pvc.json
....

In this structure, each strategy's templates live in a subdirectory
Expand Down