Skip to content

Commit f42d032

Browse files
zlianzhuangzlianzhuang
committed
v1.4.0 support pgrouting
1 parent 2b3d9ad commit f42d032

File tree

11 files changed

+67
-24
lines changed

11 files changed

+67
-24
lines changed

‎docs/index.yaml

+31-7
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,33 @@
11
apiVersion: v1
22
entries:
33
postgres-operator:
4+
- apiVersion: v2
5+
appVersion: v1.4.0
6+
created: "2024-02-21T15:24:56.605282595+08:00"
7+
description: A Helm chart for Kubernetes
8+
digest: 132457c544a197bf98c3756a047f12a0d0b56faae0ec6dd0976b06d2724e7a41
9+
home: https://github.com/radondb/multi-platform-postgresql
10+
keywords:
11+
- operator
12+
- postgresql
13+
- database
14+
maintainers:
15+
- email: [email protected]
16+
name: lzzhang
17+
url: https://lzzhang.github.io/
18+
- email: [email protected]
19+
name: yanboer
20+
url: https://yanboer.github.io/
21+
name: postgres-operator
22+
sources:
23+
- https://github.com/radondb/multi-platform-postgresql
24+
type: application
25+
urls:
26+
- https://radondb.github.io/multi-platform-postgresql/postgres-operator-v1.4.0.tgz
27+
version: v1.4.0
428
- apiVersion: v2
529
appVersion: v1.3.1
6-
created: "2023-10-25T20:45:32.275071472+08:00"
30+
created: "2024-02-21T15:24:56.604993272+08:00"
731
description: A Helm chart for Kubernetes
832
digest: ab997ad069aafefefabdf1a7e639f13a9062793e91519085f668b49ea0d63f7c
933
home: https://github.com/radondb/multi-platform-postgresql
@@ -27,7 +51,7 @@ entries:
2751
version: v1.3.1
2852
- apiVersion: v2
2953
appVersion: v1.2.2
30-
created: "2023-10-25T20:45:32.274689684+08:00"
54+
created: "2024-02-21T15:24:56.600940367+08:00"
3155
description: A Helm chart for Kubernetes
3256
digest: 92597473448348a9ef6ee132e784893544b5e86bda47f3c2db09fec46eaaa191
3357
home: https://github.com/radondb/multi-platform-postgresql
@@ -51,7 +75,7 @@ entries:
5175
version: v1.2.4
5276
- apiVersion: v2
5377
appVersion: v1.2.2
54-
created: "2023-10-25T20:45:32.274302239+08:00"
78+
created: "2024-02-21T15:24:56.59973719+08:00"
5579
description: A Helm chart for Kubernetes
5680
digest: 8bac6454e30fe8d775f995e3afaf3e03d94413b58bbaa128ae66507334d3ac99
5781
home: https://github.com/radondb/multi-platform-postgresql
@@ -75,7 +99,7 @@ entries:
7599
version: v1.2.2
76100
- apiVersion: v2
77101
appVersion: v1.2.0
78-
created: "2023-10-25T20:45:32.273944801+08:00"
102+
created: "2024-02-21T15:24:56.598479812+08:00"
79103
description: A Helm chart for Kubernetes
80104
digest: 8d1a597a8c52041b8d9d391188d4749abe00f3083e31036000edb0c15975df4e
81105
home: https://github.com/radondb/multi-platform-postgresql
@@ -99,7 +123,7 @@ entries:
99123
version: v1.2.0
100124
- apiVersion: v2
101125
appVersion: v1.1.1
102-
created: "2023-10-25T20:45:32.273610788+08:00"
126+
created: "2024-02-21T15:24:56.59748319+08:00"
103127
description: A Helm chart for Kubernetes
104128
digest: 4a536a53eed956e2cf28ffe2addf0625031de1f2581ce40884be94490923d5a2
105129
home: https://github.com/radondb/multi-platform-postgresql
@@ -123,7 +147,7 @@ entries:
123147
version: v1.0.1
124148
- apiVersion: v2
125149
appVersion: v1.1.0
126-
created: "2023-10-25T20:45:32.273238511+08:00"
150+
created: "2024-02-21T15:24:56.591375309+08:00"
127151
description: A Helm chart for Kubernetes
128152
digest: 1f6593413ae373c5caa7b8c41a3cd3697fbb164ba417260a3fefa6d32a1852e8
129153
home: https://github.com/radondb/multi-platform-postgresql
@@ -145,4 +169,4 @@ entries:
145169
urls:
146170
- https://radondb.github.io/multi-platform-postgresql/postgres-operator-v1.0.0.tgz
147171
version: v1.0.0
148-
generated: "2023-10-25T20:45:32.272603858+08:00"
172+
generated: "2024-02-21T15:24:56.590217832+08:00"

‎docs/postgres-operator-v1.4.0.tgz

4.48 KB
Binary file not shown.

‎helmversions.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
2-
"appVersion": "v1.3.1",
3-
"version": "v1.3.1",
2+
"appVersion": "v1.4.0",
3+
"version": "v1.4.0",
44

55
"template_name": "radondb-postgres-operator",
6-
"template_image": "radondb/radondb-postgres-operator:v1.3.1",
6+
"template_image": "radondb/radondb-postgres-operator:v1.4.0",
77
"template_enablePrometheusMonitor": "false",
88
"template_prometheusMonitorLabels": "{}",
99
"template_imageRegistry": "",

‎image/postgresql/Dockerfile.template

+13-1
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ RUN apt install -y --no-install-recommends \
4949
libgdal-dev \
5050
python3 \
5151
python3-pip \
52+
libboost-dev \
53+
cmake \
5254
xsltproc
5355
#{{ if env.arch == "aarch64" then ( -}}
5456
# ""
@@ -142,6 +144,16 @@ RUN cd /usr/src/pgvector; \
142144
make PG_CONFIG=/var/lib/postgresql/bin/pg_config -j `expr $(nproc) - 2` >/dev/null; \
143145
make install PG_CONFIG=/var/lib/postgresql/bin/pg_config;
144146

147+
ADD pgrouting /usr/src/pgrouting
148+
RUN cd /usr/src/pgrouting; \
149+
git checkout {{ .pgrouting }}; \
150+
mkdir build; \
151+
cd build; \
152+
export PATH=/var/lib/postgresql/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin; \
153+
cmake -LA ..; \
154+
make -j `expr $(nproc) - 2` >/dev/null; \
155+
make install ;
156+
145157
RUN cd /var/lib/postgresql; \
146158
tar czhvf lib.tar.gz `find . -type f | xargs ldd 2>/dev/null | grep "=>" | cut -d ">" -f 2 | cut -d "(" -f 1 | sort -u`
147159

@@ -158,7 +170,7 @@ ENV XDG_CONFIG_HOME /var/lib/postgresql/data/auto_failover
158170
ENV XDG_DATA_HOME /var/lib/postgresql/data/auto_failover
159171
ENV ASSIST /var/lib/postgresql/data/assist
160172
ENV PGPASSFILE /var/lib/postgresql/data/assist/pgpassfile
161-
ENV PATH /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/var/lib/postgresql/bin
173+
ENV PATH /var/lib/postgresql/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
162174
ENV PGHOME /var/lib/postgresql
163175
VOLUME /var/lib/postgresql/data
164176

‎image/postgresql/pgtools

+2-2
Original file line numberDiff line numberDiff line change
@@ -540,14 +540,14 @@ if [ "${do_hba}" = 1 ]; then
540540
fi
541541

542542
cp "$hba_file_origin" "$hba_file"
543-
env | grep "^$PG_HBA" | while read item
543+
env | grep "^$PG_HBA" | sort | while read item
544544
do
545545
conf=${item#*${PG_HBA}}
546546
#conf_name=${conf%%=*}
547547
conf_value=${conf#*=}
548548
echo "$conf_value" >> "$hba_file"
549549
done
550-
echo "host all all all md5" >> "$hba_file"
550+
#echo "host all all all md5" >> "$hba_file"
551551
echo "host replication all all md5" >> "$hba_file"
552552

553553
reload_postgresql

‎operatorversions.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"clusterrolebinding": "radondb-postgres-operator-rolebinding-cluster",
77
"rolebinding": "radondb-postgres-operator-rolebinding-role",
88
"name": "radondb-postgres-operator",
9-
"image": "radondb/radondb-postgres-operator:v1.3.4",
9+
"image": "radondb/radondb-postgres-operator:v1.4.0",
1010
"datapath": "/data",
1111
"imageRegistry": "",
1212
"namespaceOverride": ""

‎pgversions.json

+8-4
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@
1212
"pgaudit": "1.4.3",
1313
"postgres_aws_s3": "v1.0.0",
1414
"name": "radondb-postgresql",
15-
"version": "v1.3.1",
15+
"version": "v1.4.0",
1616
"pgvector": "v0.5.0",
17+
"pgrouting": "v3.6.1",
1718
"arches": [
1819
"aarch64",
1920
"x86_64"
@@ -32,8 +33,9 @@
3233
"pgaudit": "1.5.2",
3334
"postgres_aws_s3": "v1.0.0",
3435
"name": "radondb-postgresql",
35-
"version": "v1.3.1",
36+
"version": "v1.4.0",
3637
"pgvector": "v0.5.0",
38+
"pgrouting": "v3.6.1",
3739
"arches": [
3840
"aarch64",
3941
"x86_64"
@@ -52,8 +54,9 @@
5254
"pgaudit": "1.6.2",
5355
"postgres_aws_s3": "v1.0.0",
5456
"name": "radondb-postgresql",
55-
"version": "v1.3.1",
57+
"version": "v1.4.0",
5658
"pgvector": "v0.5.0",
59+
"pgrouting": "v3.6.1",
5760
"arches": [
5861
"aarch64",
5962
"x86_64"
@@ -72,8 +75,9 @@
7275
"pgaudit": "1.7.0",
7376
"postgres_aws_s3": "v1.0.0",
7477
"name": "radondb-postgresql",
75-
"version": "v1.3.1",
78+
"version": "v1.4.0",
7679
"pgvector": "v0.5.0",
80+
"pgrouting": "v3.6.1",
7781
"arches": [
7882
"aarch64",
7983
"x86_64"

‎platforms/kubernetes/postgres-operator/deploy/postgres-operator.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -723,7 +723,7 @@ spec:
723723
priorityClassName: system-cluster-critical
724724
containers:
725725
- name: radondb-postgres-operator
726-
image: radondb/radondb-postgres-operator:v1.3.4
726+
image: radondb/radondb-postgres-operator:v1.4.0
727727
imagePullPolicy: IfNotPresent
728728
resources:
729729
requests:

‎platforms/kubernetes/postgres-operator/deploy/postgresql.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -51,16 +51,16 @@ spec:
5151
terminationGracePeriodSeconds: 60
5252
# priorityClassName: high-priority
5353
containers:
54-
- image: radondb-postgresql:15.3-v1.3.1
54+
- image: radondb-postgresql:15.3-v1.4.0
5555
imagePullPolicy: IfNotPresent
5656
name: postgresql #can't change the name
5757
volumeMounts:
5858
- name: data # can't change the name
5959
mountPath: /var/lib/postgresql/data
6060
resources:
6161
limits:
62-
memory: "200Mi"
63-
cpu: "0.2"
62+
memory: "500Mi"
63+
cpu: "0.5"
6464
- image: radondb-postgres-exporter:15-v1.2.1
6565
imagePullPolicy: IfNotPresent
6666
name: exporter # can't change the name
@@ -103,7 +103,7 @@ spec:
103103
podspec:
104104
terminationGracePeriodSeconds: 60
105105
containers:
106-
- image: radondb-postgresql:15.3-v1.3.1
106+
- image: radondb-postgresql:15.3-v1.4.0
107107
imagePullPolicy: IfNotPresent
108108
name: postgresql #can't change the name
109109
volumeMounts:
@@ -140,7 +140,7 @@ spec:
140140
podspec:
141141
terminationGracePeriodSeconds: 60
142142
containers:
143-
- image: radondb-postgresql:15.3-v1.3.1
143+
- image: radondb-postgresql:15.3-v1.4.0
144144
imagePullPolicy: IfNotPresent
145145
name: postgresql #can't change the name
146146
volumeMounts:

‎source_code/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ barman
77
pgaudit
88
postgres-aws-s3
99
pgvector
10+
pgrouting

‎source_code/download.sh

+2
Original file line numberDiff line numberDiff line change
@@ -58,4 +58,6 @@ download_source_code "postgres-aws-s3" "https://github.com/radondb/postgres-aws-
5858
# pgvector
5959
download_source_code "pgvector" "https://github.com/pgvector/pgvector.git"
6060

61+
# pgrouting
62+
download_source_code "pgrouting" "https://github.com/pgRouting/pgrouting.git"
6163
exit 0

0 commit comments

Comments
 (0)