Skip to content

Commit 0605ea5

Browse files
committed
Pull updates from upstream (mostly repo paths)
1 parent 45cc173 commit 0605ea5

20 files changed

+100
-89
lines changed

product_docs/docs/postgres_for_kubernetes/1/backup_barmanobjectstore.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ be *tarballs*. Both base backups and WAL files can be compressed
2929
and encrypted.
3030

3131
For this, it is required to use an image with `barman-cli-cloud` included.
32-
You can use the image `quay.io/enterprisedb/postgresql` for this scope,
32+
You can use the image `docker.enterprisedb.com/k8s_enterprise/postgresql` for this scope,
3333
as it is composed of a community PostgreSQL image and the latest
3434
`barman-cli-cloud` package.
3535

product_docs/docs/postgres_for_kubernetes/1/bootstrap.mdx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -641,7 +641,7 @@ metadata:
641641
name: target-db
642642
spec:
643643
instances: 3
644-
imageName: quay.io/enterprisedb/postgresql:18.0-system-trixie
644+
imageName: docker.enterprisedb.com/k8s_enterprise/postgresql:18.0-system-trixie
645645
646646
bootstrap:
647647
pg_basebackup:
@@ -691,7 +691,7 @@ metadata:
691691
name: cluster-clone-tls
692692
spec:
693693
instances: 3
694-
imageName: quay.io/enterprisedb/postgresql:18.0-system-trixie
694+
imageName: docker.enterprisedb.com/k8s_enterprise/postgresql:18.0-system-trixie
695695
696696
bootstrap:
697697
pg_basebackup:

product_docs/docs/postgres_for_kubernetes/1/container_images.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ automatically overrides it with its instance manager.
3939
EDB provides and maintains
4040
[public PostgreSQL container images](https://github.com/enterprisedb/docker-postgres)
4141
that are fully compatible with {{name.ln}}. These images are published on
42-
[quay.io](https://quay.io/enterprisedb/postgresql).
42+
[docker.enterprisedb.com](https://docker.enterprisedb.com/k8s_enterprise/postgresql).
4343

4444
## Image Tag Requirements
4545

product_docs/docs/postgres_for_kubernetes/1/declarative_hibernation.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ $ kubectl cnp status <cluster-name>
5555
Cluster Summary
5656
Name: cluster-example
5757
Namespace: default
58-
PostgreSQL Image: quay.io/enterprisedb/postgresql:18.0-system-trixie
58+
PostgreSQL Image: docker.enterprisedb.com/k8s_enterprise/postgresql:18.0-system-trixie
5959
Primary instance: cluster-example-2
6060
Status: Cluster in healthy state
6161
Instances: 3

product_docs/docs/postgres_for_kubernetes/1/image_catalog.mdx

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ metadata:
3535
spec:
3636
images:
3737
- major: 15
38-
image: quay.io/enterprisedb/postgresql:15.14-system-trixie
38+
image: docker.enterprisedb.com/k8s_enterprise/postgresql:15.14-system-trixie
3939
- major: 16
40-
image: quay.io/enterprisedb/postgresql:16.10-system-trixie
40+
image: docker.enterprisedb.com/k8s_enterprise/postgresql:16.10-system-trixie
4141
- major: 17
42-
image: quay.io/enterprisedb/postgresql:17.6-system-trixie
42+
image: docker.enterprisedb.com/k8s_enterprise/postgresql:17.6-system-trixie
4343
- major: 18
44-
image: quay.io/enterprisedb/postgresql:18.0-system-trixie
44+
image: docker.enterprisedb.com/k8s_enterprise/postgresql:18.0-system-trixie
4545
```
4646
4747
**Example of a Cluster-Wide Catalog using `ClusterImageCatalog` Resource:**
@@ -54,13 +54,13 @@ metadata:
5454
spec:
5555
images:
5656
- major: 15
57-
image: quay.io/enterprisedb/postgresql:15.14-system-trixie
57+
image: docker.enterprisedb.com/k8s_enterprise/postgresql:15.14-system-trixie
5858
- major: 16
59-
image: quay.io/enterprisedb/postgresql:16.10-system-trixie
59+
image: docker.enterprisedb.com/k8s_enterprise/postgresql:16.10-system-trixie
6060
- major: 17
61-
image: quay.io/enterprisedb/postgresql:17.6-system-trixie
61+
image: docker.enterprisedb.com/k8s_enterprise/postgresql:17.6-system-trixie
6262
- major: 18
63-
image: quay.io/enterprisedb/postgresql:18.0-system-trixie
63+
image: docker.enterprisedb.com/k8s_enterprise/postgresql:18.0-system-trixie
6464
```
6565

6666
A `Cluster` resource has the flexibility to reference either an `ImageCatalog`

product_docs/docs/postgres_for_kubernetes/1/imagevolume_extensions.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ spec:
302302
```
303303

304304
{{name.ln}} will set the `LD_LIBRARY_PATH` environment variable to include
305-
`/extensions/postgis/system`, allowing PostgreSQL to locate and load these
305+
`/extensions/postgis/syslib`, allowing PostgreSQL to locate and load these
306306
system libraries at runtime.
307307

308308
!!! Important

product_docs/docs/postgres_for_kubernetes/1/logical_replication.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ metadata:
351351
spec:
352352
instances: 1
353353
354-
imageName: quay.io/enterprisedb/postgresql:16
354+
imageName: docker.enterprisedb.com/k8s_enterprise/postgresql:16
355355
356356
storage:
357357
size: 1Gi

product_docs/docs/postgres_for_kubernetes/1/pg4k.v1/v1.27.1.mdx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4137,8 +4137,9 @@ cluster to be reconciled</p>
41374137
<i>bool</i>
41384138
</td>
41394139
<td>
4140-
<p>Only one plugin can be declared as WALArchiver.
4141-
Cannot be active if &quot;.spec.backup.barmanObjectStore&quot; configuration is present.</p>
4140+
<p>Marks the plugin as the WAL archiver. At most one plugin can be
4141+
designated as a WAL archiver. This cannot be enabled if the
4142+
<code>.spec.backup.barmanObjectStore</code> configuration is present.</p>
41424143
</td>
41434144
</tr>
41444145
<tr><td><code>parameters</code><br/>

product_docs/docs/postgres_for_kubernetes/1/postgis.mdx

Lines changed: 66 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,20 @@ Systems) objects in the database and be queried via SQL.
1313
in Kubernetes via {{name.ln}}.
1414

1515
The CloudNativePG Community maintains container images that are built on top
16-
of the official [PostGIS images hosted on DockerHub](https://hub.docker.com/r/postgis/postgis).
17-
For more information please visit:
16+
of the maintained [PostgreSQL Container images](https://github.com/cloudnative-pg/postgres-containers).
17+
For more information, please visit:
1818

1919
- The [`postgis-containers` project in GitHub](https://github.com/cloudnative-pg/postgis-containers)
2020
- The [`postgis-containers` Container Registry in GitHub](https://github.com/cloudnative-pg/postgis-containers/pkgs/container/postgis)
2121

22-
Additionally, EDB provides container images for EDB Postgres Advanced Server
23-
that include PostGIS and makes them available in the official
24-
[registry on Quay.io](https://quay.io/repository/enterprisedb/edb-postgres-advanced?tab=tags)
25-
with the `-postgis` suffix.
22+
Additionally, EDB provides container images for:
23+
24+
- Community PostgreSQL + PostGIS
25+
- EDB Postgres Advanced Server (EPAS) + PostGIS
26+
- EDB Postgres Extended (PGE) + PostGIS
27+
28+
and makes them available in the official registry
29+
at `docker.enterprisedb.com`, with the `-postgis` suffix.
2630

2731
## Basic concepts about a PostGIS cluster
2832

@@ -43,18 +47,18 @@ do this in two ways:
4347

4448
- install it in the application database, which is the main and supposedly only
4549
database you host in the cluster according to the microservice architecture, or
46-
- install it in the `template1` database so as to make it available for all the
50+
- install it in the `template1` database to make it available for all the
4751
databases you end up creating in the cluster, in case you adopt the monolith
4852
architecture where the instance is shared by multiple databases
4953

5054
!!! Info
51-
For more information on the microservice vs monolith architecture in the database
55+
For more information on the microservice vs monolith architecture in the database,
5256
please refer to the ["How many databases should be hosted in a single PostgreSQL instance?" FAQ](faq.md)
5357
or the ["Database import" section](database_import.md).
5458

5559
## Create a new PostgreSQL cluster with PostGIS
5660

57-
Let's suppose you want to create a new PostgreSQL 14 cluster with PostGIS 3.2.
61+
Let's suppose you want to create a new PostgreSQL 18 cluster with PostGIS 3.6.
5862

5963
The first step is to ensure you use the right PostGIS container image for the
6064
operand, and properly set the `.spec.imageName` option in the `Cluster`
@@ -66,82 +70,90 @@ provides some guidance on how the creation of a PostGIS cluster can be done.
6670
!!! Warning
6771
Please consider that, although convention over configuration applies in
6872
{{name.ln}}, you should spend time configuring and tuning your system for
69-
production. Also the `imageName` in the example below deliberately points
70-
to the latest available image for PostgreSQL 14 - you should use a specific
73+
production. Also, the `imageName` in the example below deliberately points
74+
to the latest available image for PostgreSQL 17 - you should use a specific
7175
image name or, preferably, the SHA256 digest for true immutability.
7276

7377
```yaml
74-
apiVersion: postgresql.k8s.enterprisedb.io/v1
78+
apiVersion: postgresql.cnpg.io/v1
7579
kind: Cluster
7680
metadata:
7781
name: postgis-example
7882
spec:
79-
instances: 3
80-
imageName: ghcr.io/enterprisedb/postgresql:16-postgis
81-
bootstrap:
82-
initdb:
83-
postInitTemplateSQL:
84-
- CREATE EXTENSION postgis;
85-
- CREATE EXTENSION postgis_topology;
86-
- CREATE EXTENSION fuzzystrmatch;
87-
- CREATE EXTENSION postgis_tiger_geocoder;
88-
83+
instances: 1
84+
imageName: docker.enterprisedb.com/k8s_enterprise/postgresql:17-postgis-ubi9
8985
storage:
9086
size: 1Gi
87+
postgresql:
88+
parameters:
89+
log_statement: ddl
90+
---
91+
apiVersion: postgresql.cnpg.io/v1
92+
kind: Database
93+
metadata:
94+
name: postgis-example-app
95+
spec:
96+
name: app
97+
owner: app
98+
cluster:
99+
name: postgis-example
100+
extensions:
101+
- name: postgis
102+
- name: postgis_topology
103+
- name: fuzzystrmatch
104+
- name: postgis_tiger_geocoder
91105
```
92106
93-
The example relies on the `postInitTemplateSQL` option which executes a list of
94-
queries against the `template1` database, before the actual creation of the
95-
application database (called `app`). This means that, once you have applied the
96-
manifest and the cluster is up, you will have the above extensions installed in
97-
both the template database and the application database, ready for use.
107+
The example leverages the `Database` resource's declarative extension
108+
management to add the specified extensions to the `app` database.
98109

99110
!!! Info
100111
Take some time and look at the available options in `.spec.bootstrap.initdb`
101112
from the [API reference](pg4k.v1.md#postgresql-k8s-enterprisedb-io-v1-BootstrapInitDB), such as
102113
`postInitApplicationSQL`.
103114

115+
!!! Info
116+
For more details, see the
117+
["Managing Extensions in a Database" section](declarative_database_management.md#managing-extensions-in-a-database).
118+
104119
You can easily verify the available version of PostGIS that is in the
105120
container, by connecting to the `app` database (you might obtain different
106121
values from the ones in this document):
107122

108123
```console
109-
$ kubectl exec -ti postgis-example-1 -- psql app
110-
Defaulted container "postgres" out of: postgres, bootstrap-controller (init)
111-
psql (16.0 (Debian 16.0-1.pgdg110+1))
124+
$ kubectl cnpg psql postgis-example -- app
125+
psql (18.0 (Debian 18.0-1.pgdg13+3))
112126
Type "help" for help.
113127
114128
app=# SELECT * FROM pg_available_extensions WHERE name ~ '^postgis' ORDER BY 1;
115129
name | default_version | installed_version | comment
116130
--------------------------+-----------------+-------------------+------------------------------------------------------------
117-
postgis | 3.2.2 | 3.2.2 | PostGIS geometry and geography spatial types and functions
118-
postgis-3 | 3.2.2 | | PostGIS geometry and geography spatial types and functions
119-
postgis_raster | 3.2.2 | | PostGIS raster types and functions
120-
postgis_raster-3 | 3.2.2 | | PostGIS raster types and functions
121-
postgis_sfcgal | 3.2.2 | | PostGIS SFCGAL functions
122-
postgis_sfcgal-3 | 3.2.2 | | PostGIS SFCGAL functions
123-
postgis_tiger_geocoder | 3.2.2 | 3.2.2 | PostGIS tiger geocoder and reverse geocoder
124-
postgis_tiger_geocoder-3 | 3.2.2 | | PostGIS tiger geocoder and reverse geocoder
125-
postgis_topology | 3.2.2 | 3.2.2 | PostGIS topology spatial types and functions
126-
postgis_topology-3 | 3.2.2 | | PostGIS topology spatial types and functions
131+
postgis | 3.6.0 | 3.6.0 | PostGIS geometry and geography spatial types and functions
132+
postgis-3 | 3.6.0 | | PostGIS geometry and geography spatial types and functions
133+
postgis_raster | 3.6.0 | | PostGIS raster types and functions
134+
postgis_raster-3 | 3.6.0 | | PostGIS raster types and functions
135+
postgis_sfcgal | 3.6.0 | | PostGIS SFCGAL functions
136+
postgis_sfcgal-3 | 3.6.0 | | PostGIS SFCGAL functions
137+
postgis_tiger_geocoder | 3.6.0 | 3.6.0 | PostGIS tiger geocoder and reverse geocoder
138+
postgis_tiger_geocoder-3 | 3.6.0 | | PostGIS tiger geocoder and reverse geocoder
139+
postgis_topology | 3.6.0 | 3.6.0 | PostGIS topology spatial types and functions
140+
postgis_topology-3 | 3.6.0 | | PostGIS topology spatial types and functions
127141
(10 rows)
128142
```
129143

130-
The next step is to verify that the extensions listed in the
131-
`postInitTemplateSQL` section have been correctly installed in the `app`
132-
database.
144+
The next step is to verify that the extensions listed in the `Database`
145+
resource have been correctly installed in the `app` database.
133146

134147
```console
135148
app=# \dx
136-
List of installed extensions
137-
Name | Version | Schema | Description
138-
------------------------+---------+------------+------------------------------------------------------------
139-
fuzzystrmatch | 1.1 | public | determine similarities and distance between strings
140-
plpgsql | 1.0 | pg_catalog | PL/pgSQL procedural language
141-
postgis | 3.2.2 | public | PostGIS geometry and geography spatial types and functions
142-
postgis_tiger_geocoder | 3.2.2 | tiger | PostGIS tiger geocoder and reverse geocoder
143-
postgis_topology | 3.2.2 | topology | PostGIS topology spatial types and functions
144-
(5 rows)
149+
List of installed extensions
150+
Name | Version | Default version | Schema | Description
151+
------------------------+---------+-----------------+------------+------------------------------------------------------------
152+
fuzzystrmatch | 1.2 | 1.2 | public | determine similarities and distance between strings
153+
plpgsql | 1.0 | 1.0 | pg_catalog | PL/pgSQL procedural language
154+
postgis | 3.6.0 | 3.6.0 | public | PostGIS geometry and geography spatial types and functions
155+
postgis_tiger_geocoder | 3.6.0 | 3.6.0 | tiger | PostGIS tiger geocoder and reverse geocoder
156+
postgis_topology | 3.6.0 | 3.6.0 | topology | PostGIS topology spatial types and functions
145157
```
146158

147159
Finally:
@@ -150,6 +162,7 @@ Finally:
150162
app=# SELECT postgis_full_version();
151163
postgis_full_version
152164
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
153-
POSTGIS="3.2.2 628da50" [EXTENSION] PGSQL="140" GEOS="3.9.0-CAPI-1.16.2" PROJ="7.2.1" LIBXML="2.9.10" LIBJSON="0.15" LIBPROTOBUF="1.3.3" WAGYU="0.5.0 (Internal)" TOPOLOGY
165+
POSTGIS="3.6.0 4c1967d" [EXTENSION] PGSQL="180" GEOS="3.13.1-CAPI-1.19.2" PROJ="9.6.0 NETWORK_ENABLED=OFF URL_ENDPOINT=https://cdn.proj.org USER_WRITABLE_DIRECTORY=/tmp/proj DATABASE_PATH=/usr/share/proj/proj.
166+
db" (compiled against PROJ 9.6.0) LIBXML="2.9.14" LIBJSON="0.18" LIBPROTOBUF="1.5.1" WAGYU="0.5.0 (Internal)" TOPOLOGY
154167
(1 row)
155168
```

product_docs/docs/postgres_for_kubernetes/1/postgres_upgrades.mdx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ kind: Cluster
154154
metadata:
155155
name: cluster-example
156156
spec:
157-
imageName: quay.io/enterprisedb/postgresql:16-minimal-trixie
157+
imageName: docker.enterprisedb.com/k8s_enterprise/postgresql:16-minimal-trixie
158158
instances: 3
159159
storage:
160160
size: 1Gi
@@ -181,7 +181,7 @@ kind: Cluster
181181
metadata:
182182
name: cluster-example
183183
spec:
184-
imageName: quay.io/enterprisedb/postgresql:17-minimal-trixie
184+
imageName: docker.enterprisedb.com/k8s_enterprise/postgresql:17-minimal-trixie
185185
instances: 3
186186
storage:
187187
size: 1Gi

0 commit comments

Comments
 (0)