update citus images and hosts, to generate helm charts

This commit is contained in:
2025-04-25 10:32:39 +07:00
parent 8f22fd255e
commit 3a9befc1a2
6 changed files with 41 additions and 18 deletions
+1 -1
View File
@@ -7,7 +7,7 @@ ARG PGDATA=$PGHOME/data
ARG LC_ALL=C.UTF-8 ARG LC_ALL=C.UTF-8
ARG LANG=C.UTF-8 ARG LANG=C.UTF-8
FROM postgres:$PG_MAJOR as builder FROM postgres:$PG_MAJOR AS builder
ARG PGHOME ARG PGHOME
ARG PGDATA ARG PGDATA
+34 -11
View File
@@ -8,16 +8,19 @@
# The cluster could be started as: # The cluster could be started as:
# $ docker-compose -f docker-compose-citus.yml up -d # $ docker-compose -f docker-compose-citus.yml up -d
# You can read more about it in the: # You can read more about it in the:
# https://github.com/patroni/patroni/blob/master/docker/README.md#citus-cluster # https://github.com/zalando/patroni/blob/master/docker/README.md#citus-cluster
version: "2" version: "3"
networks: networks:
demo: demo:
services: services:
etcd1: &etcd etcd1: &etcd
image: ${PATRONI_TEST_IMAGE:-patroni-citus} image: harbor.optimcloud.com/library/optim/patroni-citus:latest
networks: [ demo ] networks: [ demo ]
ports:
- 2379
- 2380
environment: environment:
ETCD_LISTEN_PEER_URLS: http://0.0.0.0:2380 ETCD_LISTEN_PEER_URLS: http://0.0.0.0:2380
ETCD_LISTEN_CLIENT_URLS: http://0.0.0.0:2379 ETCD_LISTEN_CLIENT_URLS: http://0.0.0.0:2379
@@ -32,17 +35,23 @@ services:
etcd2: etcd2:
<<: *etcd <<: *etcd
container_name: demo-etcd2 container_name: demo-etcd2
ports:
- 2379
- 2380
hostname: etcd2 hostname: etcd2
command: etcd --name etcd2 --initial-advertise-peer-urls http://etcd2:2380 command: etcd --name etcd2 --initial-advertise-peer-urls http://etcd2:2380
etcd3: etcd3:
<<: *etcd <<: *etcd
container_name: demo-etcd3 container_name: demo-etcd3
ports:
- 2379
- 2380
hostname: etcd3 hostname: etcd3
command: etcd --name etcd3 --initial-advertise-peer-urls http://etcd3:2380 command: etcd --name etcd3 --initial-advertise-peer-urls http://etcd3:2380
haproxy: haproxy:
image: ${PATRONI_TEST_IMAGE:-patroni-citus} image: harbor.optimcloud.com/library/optim/patroni-citus:latest
networks: [ demo ] networks: [ demo ]
env_file: docker/patroni.env env_file: docker/patroni.env
hostname: haproxy hostname: haproxy
@@ -63,8 +72,10 @@ services:
PGSSLROOTCERT: /etc/ssl/certs/ssl-cert-snakeoil.pem PGSSLROOTCERT: /etc/ssl/certs/ssl-cert-snakeoil.pem
coord1: coord1:
image: ${PATRONI_TEST_IMAGE:-patroni-citus} image: harbor.optimcloud.com/library/optim/patroni-citus:latest
networks: [ demo ] networks: [ demo ]
ports:
- "5432"
env_file: docker/patroni.env env_file: docker/patroni.env
hostname: coord1 hostname: coord1
container_name: demo-coord1 container_name: demo-coord1
@@ -74,8 +85,10 @@ services:
PATRONI_CITUS_GROUP: 0 PATRONI_CITUS_GROUP: 0
coord2: coord2:
image: ${PATRONI_TEST_IMAGE:-patroni-citus} image: harbor.optimcloud.com/library/optim/patroni-citus:latest
networks: [ demo ] networks: [ demo ]
ports:
- "5432"
env_file: docker/patroni.env env_file: docker/patroni.env
hostname: coord2 hostname: coord2
container_name: demo-coord2 container_name: demo-coord2
@@ -84,8 +97,10 @@ services:
PATRONI_NAME: coord2 PATRONI_NAME: coord2
coord3: coord3:
image: ${PATRONI_TEST_IMAGE:-patroni-citus} image: harbor.optimcloud.com/library/optim/patroni-citus:latest
networks: [ demo ] networks: [ demo ]
ports:
- "5432"
env_file: docker/patroni.env env_file: docker/patroni.env
hostname: coord3 hostname: coord3
container_name: demo-coord3 container_name: demo-coord3
@@ -95,8 +110,10 @@ services:
work1-1: work1-1:
image: ${PATRONI_TEST_IMAGE:-patroni-citus} image: harbor.optimcloud.com/library/optim/patroni-citus:latest
networks: [ demo ] networks: [ demo ]
ports:
- "5432"
env_file: docker/patroni.env env_file: docker/patroni.env
hostname: work1-1 hostname: work1-1
container_name: demo-work1-1 container_name: demo-work1-1
@@ -106,8 +123,10 @@ services:
PATRONI_CITUS_GROUP: 1 PATRONI_CITUS_GROUP: 1
work1-2: work1-2:
image: ${PATRONI_TEST_IMAGE:-patroni-citus} image: harbor.optimcloud.com/library/optim/patroni-citus:latest
networks: [ demo ] networks: [ demo ]
ports:
- "5432"
env_file: docker/patroni.env env_file: docker/patroni.env
hostname: work1-2 hostname: work1-2
container_name: demo-work1-2 container_name: demo-work1-2
@@ -117,8 +136,10 @@ services:
work2-1: work2-1:
image: ${PATRONI_TEST_IMAGE:-patroni-citus} image: harbor.optimcloud.com/library/optim/patroni-citus:latest
networks: [ demo ] networks: [ demo ]
ports:
- "5432"
env_file: docker/patroni.env env_file: docker/patroni.env
hostname: work2-1 hostname: work2-1
container_name: demo-work2-1 container_name: demo-work2-1
@@ -128,8 +149,10 @@ services:
PATRONI_CITUS_GROUP: 2 PATRONI_CITUS_GROUP: 2
work2-2: work2-2:
image: ${PATRONI_TEST_IMAGE:-patroni-citus} image: harbor.optimcloud.com/library/optim/patroni-citus:latest
networks: [ demo ] networks: [ demo ]
ports:
- "5432"
env_file: docker/patroni.env env_file: docker/patroni.env
hostname: work2-2 hostname: work2-2
container_name: demo-work2-2 container_name: demo-work2-2
+3 -3
View File
@@ -59,7 +59,7 @@ spec:
serviceAccountName: citusdemo serviceAccountName: citusdemo
containers: containers:
- name: *cluster_name - name: *cluster_name
image: patroni-citus-k8s # docker build -f Dockerfile.citus -t patroni-citus-k8s . image: harbor.optimcloud.com/library/optim/patroni-citus-k8s # docker build -f Dockerfile.citus -t patroni-citus-k8s .
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
readinessProbe: readinessProbe:
httpGet: httpGet:
@@ -169,7 +169,7 @@ spec:
serviceAccountName: citusdemo serviceAccountName: citusdemo
containers: containers:
- name: *cluster_name - name: *cluster_name
image: patroni-citus-k8s # docker build -f Dockerfile.citus -t patroni-citus-k8s . image: harbor.optimcloud.com/library/optim/patroni-citus-k8s # docker build -f Dockerfile.citus -t patroni-citus-k8s .
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
readinessProbe: readinessProbe:
httpGet: httpGet:
@@ -279,7 +279,7 @@ spec:
serviceAccountName: citusdemo serviceAccountName: citusdemo
containers: containers:
- name: *cluster_name - name: *cluster_name
image: patroni-citus-k8s # docker build -f Dockerfile.citus -t patroni-citus-k8s . image: harbor.optimcloud.com/library/optim/patroni-citus-k8s # docker build -f Dockerfile.citus -t patroni-citus-k8s .
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
readinessProbe: readinessProbe:
httpGet: httpGet:
+1 -1
View File
@@ -68,7 +68,7 @@ bootstrap:
#- host replication replicator 127.0.0.1/32 gss include_realm=0 #- host replication replicator 127.0.0.1/32 gss include_realm=0
#- host all all 0.0.0.0/0 gss include_realm=0 #- host all all 0.0.0.0/0 gss include_realm=0
- host replication replicator 127.0.0.1/32 md5 - host replication replicator 127.0.0.1/32 md5
- host all all 0.0.0.0/0 md5 - host all all 0.0.0.0/0 trust
# - hostssl all all 0.0.0.0/0 md5 # - hostssl all all 0.0.0.0/0 md5
# use_slots: true # use_slots: true
parameters: parameters:
+1 -1
View File
@@ -62,7 +62,7 @@ bootstrap:
#- host replication replicator 127.0.0.1/32 gss include_realm=0 #- host replication replicator 127.0.0.1/32 gss include_realm=0
#- host all all 0.0.0.0/0 gss include_realm=0 #- host all all 0.0.0.0/0 gss include_realm=0
- host replication replicator 127.0.0.1/32 md5 - host replication replicator 127.0.0.1/32 md5
- host all all 0.0.0.0/0 md5 - host all all 0.0.0.0/0 trust
# - hostssl all all 0.0.0.0/0 md5 # - hostssl all all 0.0.0.0/0 md5
# use_slots: true # use_slots: true
parameters: parameters:
+1 -1
View File
@@ -62,7 +62,7 @@ bootstrap:
#- host replication replicator 127.0.0.1/32 gss include_realm=0 #- host replication replicator 127.0.0.1/32 gss include_realm=0
#- host all all 0.0.0.0/0 gss include_realm=0 #- host all all 0.0.0.0/0 gss include_realm=0
- host replication replicator 127.0.0.1/32 md5 - host replication replicator 127.0.0.1/32 md5
- host all all 0.0.0.0/0 md5 - host all all 0.0.0.0/0 trust
# - hostssl all all 0.0.0.0/0 md5 # - hostssl all all 0.0.0.0/0 md5
# use_slots: true # use_slots: true
parameters: parameters: