From c5eba0b9c744fca7f3ad19f8d2223ceec571c44d Mon Sep 17 00:00:00 2001 From: OutBack Dingo Date: Tue, 14 May 2024 23:02:56 +0700 Subject: [PATCH] Revert "updated cluster helm charts" This reverts commit bd4d93ebb492ea92725490c354975fa2ae9a8d9d. --- utils/helm/cluster/Chart.yaml | 6 +- .../cluster/templates/broker-deployment.yaml | 69 ++++++++++++++ .../cluster/templates/broker-service.yaml | 19 ++++ .../clickhouse-01-cm0-configmap.yaml | 78 ---------------- .../clickhouse-01-cm1-configmap.yaml | 47 ---------- .../templates/clickhouse-01-deployment.yaml | 59 ------------ .../templates/clickhouse-01-service.yaml | 19 ---- .../clickhouse-02-cm0-configmap.yaml | 78 ---------------- .../clickhouse-02-cm1-configmap.yaml | 47 ---------- .../templates/clickhouse-02-deployment.yaml | 59 ------------ .../templates/clickhouse-02-service.yaml | 19 ---- .../clickhouse-03-cm0-configmap.yaml | 78 ---------------- .../clickhouse-03-cm1-configmap.yaml | 47 ---------- .../templates/clickhouse-03-deployment.yaml | 59 ------------ .../templates/clickhouse-03-service.yaml | 19 ---- .../clickhouse-keeper-01-cm0-configmap.yaml | 48 ---------- .../clickhouse-keeper-01-deployment.yaml | 46 ---------- .../clickhouse-keeper-01-service.yaml | 16 ---- .../clickhouse-keeper-02-cm0-configmap.yaml | 48 ---------- .../clickhouse-keeper-02-deployment.yaml | 46 ---------- .../clickhouse-keeper-02-service.yaml | 16 ---- .../clickhouse-keeper-03-cm0-configmap.yaml | 48 ---------- .../clickhouse-keeper-03-deployment.yaml | 46 ---------- .../clickhouse-keeper-03-service.yaml | 16 ---- .../cluster/templates/etcd1-deployment.yaml | 6 +- .../helm/cluster/templates/etcd1-service.yaml | 2 +- .../cluster/templates/etcd2-deployment.yaml | 6 +- .../helm/cluster/templates/etcd2-service.yaml | 2 +- .../cluster/templates/etcd3-deployment.yaml | 6 +- .../helm/cluster/templates/etcd3-service.yaml | 2 +- .../cluster/templates/haproxy-deployment.yaml | 18 +--- .../cluster/templates/haproxy-service.yaml | 2 +- .../templates/patroni-env-configmap.yaml | 2 +- ...patroni1-claim0-persistentvolumeclaim.yaml | 12 +++ ...ployment.yaml => patroni1-deployment.yaml} | 41 ++++----- ...rd2-service.yaml => patroni1-service.yaml} | 8 +- ...ployment.yaml => patroni2-deployment.yaml} | 32 ++----- ...rd3-service.yaml => patroni2-service.yaml} | 8 +- ...ployment.yaml => patroni3-deployment.yaml} | 32 ++----- ...rd1-service.yaml => patroni3-service.yaml} | 8 +- .../cluster/templates/redis-deployment.yaml | 34 +++++++ .../helm/cluster/templates/redis-service.yaml | 16 ++++ .../cluster/templates/work1-1-deployment.yaml | 92 ------------------- .../cluster/templates/work1-1-service.yaml | 16 ---- .../cluster/templates/work1-2-deployment.yaml | 92 ------------------- .../cluster/templates/work1-2-service.yaml | 16 ---- .../cluster/templates/work2-1-deployment.yaml | 92 ------------------- .../cluster/templates/work2-1-service.yaml | 16 ---- .../cluster/templates/work2-2-deployment.yaml | 92 ------------------- .../cluster/templates/work2-2-service.yaml | 16 ---- 50 files changed, 221 insertions(+), 1481 deletions(-) create mode 100644 utils/helm/cluster/templates/broker-deployment.yaml create mode 100644 utils/helm/cluster/templates/broker-service.yaml delete mode 100644 utils/helm/cluster/templates/clickhouse-01-cm0-configmap.yaml delete mode 100644 utils/helm/cluster/templates/clickhouse-01-cm1-configmap.yaml delete mode 100644 utils/helm/cluster/templates/clickhouse-01-deployment.yaml delete mode 100644 utils/helm/cluster/templates/clickhouse-01-service.yaml delete mode 100644 utils/helm/cluster/templates/clickhouse-02-cm0-configmap.yaml delete mode 100644 utils/helm/cluster/templates/clickhouse-02-cm1-configmap.yaml delete mode 100644 utils/helm/cluster/templates/clickhouse-02-deployment.yaml delete mode 100644 utils/helm/cluster/templates/clickhouse-02-service.yaml delete mode 100644 utils/helm/cluster/templates/clickhouse-03-cm0-configmap.yaml delete mode 100644 utils/helm/cluster/templates/clickhouse-03-cm1-configmap.yaml delete mode 100644 utils/helm/cluster/templates/clickhouse-03-deployment.yaml delete mode 100644 utils/helm/cluster/templates/clickhouse-03-service.yaml delete mode 100644 utils/helm/cluster/templates/clickhouse-keeper-01-cm0-configmap.yaml delete mode 100644 utils/helm/cluster/templates/clickhouse-keeper-01-deployment.yaml delete mode 100644 utils/helm/cluster/templates/clickhouse-keeper-01-service.yaml delete mode 100644 utils/helm/cluster/templates/clickhouse-keeper-02-cm0-configmap.yaml delete mode 100644 utils/helm/cluster/templates/clickhouse-keeper-02-deployment.yaml delete mode 100644 utils/helm/cluster/templates/clickhouse-keeper-02-service.yaml delete mode 100644 utils/helm/cluster/templates/clickhouse-keeper-03-cm0-configmap.yaml delete mode 100644 utils/helm/cluster/templates/clickhouse-keeper-03-deployment.yaml delete mode 100644 utils/helm/cluster/templates/clickhouse-keeper-03-service.yaml create mode 100644 utils/helm/cluster/templates/patroni1-claim0-persistentvolumeclaim.yaml rename utils/helm/cluster/templates/{coord2-deployment.yaml => patroni1-deployment.yaml} (71%) rename utils/helm/cluster/templates/{coord2-service.yaml => patroni1-service.yaml} (54%) rename utils/helm/cluster/templates/{coord3-deployment.yaml => patroni2-deployment.yaml} (71%) rename utils/helm/cluster/templates/{coord3-service.yaml => patroni2-service.yaml} (54%) rename utils/helm/cluster/templates/{coord1-deployment.yaml => patroni3-deployment.yaml} (72%) rename utils/helm/cluster/templates/{coord1-service.yaml => patroni3-service.yaml} (54%) create mode 100644 utils/helm/cluster/templates/redis-deployment.yaml create mode 100644 utils/helm/cluster/templates/redis-service.yaml delete mode 100644 utils/helm/cluster/templates/work1-1-deployment.yaml delete mode 100644 utils/helm/cluster/templates/work1-1-service.yaml delete mode 100644 utils/helm/cluster/templates/work1-2-deployment.yaml delete mode 100644 utils/helm/cluster/templates/work1-2-service.yaml delete mode 100644 utils/helm/cluster/templates/work2-1-deployment.yaml delete mode 100644 utils/helm/cluster/templates/work2-1-service.yaml delete mode 100644 utils/helm/cluster/templates/work2-2-deployment.yaml delete mode 100644 utils/helm/cluster/templates/work2-2-service.yaml diff --git a/utils/helm/cluster/Chart.yaml b/utils/helm/cluster/Chart.yaml index f44f448..6a3d6de 100644 --- a/utils/helm/cluster/Chart.yaml +++ b/utils/helm/cluster/Chart.yaml @@ -1,8 +1,8 @@ -name: patroni-compose -description: A generated Helm Chart for patroni-compose from Skippbox Kompose +name: docker-compose +description: A generated Helm Chart for docker-compose from Skippbox Kompose version: 0.0.1 apiVersion: v2 keywords: - - patroni-compose + - docker-compose sources: home: diff --git a/utils/helm/cluster/templates/broker-deployment.yaml b/utils/helm/cluster/templates/broker-deployment.yaml new file mode 100644 index 0000000..9bb2172 --- /dev/null +++ b/utils/helm/cluster/templates/broker-deployment.yaml @@ -0,0 +1,69 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + annotations: + kompose.cmd: kompose -f docker-compose.yml convert -c + kompose.version: 1.33.0 (3ce457399) + labels: + io.kompose.service: broker + name: broker +spec: + replicas: 1 + selector: + matchLabels: + io.kompose.service: broker + template: + metadata: + annotations: + kompose.cmd: kompose -f docker-compose.yml convert -c + kompose.version: 1.33.0 (3ce457399) + labels: + io.kompose.network/patroni-default: "true" + io.kompose.service: broker + spec: + containers: + - env: + - name: ALLOW_PLAINTEXT_LISTENER + value: "yes" + - name: BITNAMI_DEBUG + value: "yes" + - name: KAFKA_AUTO_CREATE_TOPICS_ENABLE + value: "true" + - name: KAFKA_BROKER_ID + value: "1" + - name: KAFKA_CFG_ADVERTISED_LISTENERS + value: PLAINTEXT://127.0.0.1:9092,EXTERNAL://kafka_b:9094 + - name: KAFKA_CFG_CONTROLLER_LISTENER_NAMES + value: CONTROLLER + - name: KAFKA_CFG_CONTROLLER_QUORUM_VOTERS + value: 1@127.0.0.1:9093 + - name: KAFKA_CFG_LISTENERS + value: PLAINTEXT://:9092,CONTROLLER://:9093,EXTERNAL://:9094 + - name: KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP + value: CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT,EXTERNAL:PLAINTEXT + - name: KAFKA_CFG_NODE_ID + value: "1" + - name: KAFKA_CFG_NUM_PARTITIONS + value: "2" + - name: KAFKA_CFG_PROCESS_ROLES + value: broker,controller + - name: KAFKA_ENABLE_KRAFT + value: "yes" + image: docker.io/bitnami/kafka:latest + livenessProbe: + exec: + command: + - kafka-topics.sh --bootstrap-server localhost:9092 --list + failureThreshold: 3 + initialDelaySeconds: 5 + periodSeconds: 10 + timeoutSeconds: 5 + name: broker + ports: + - containerPort: 9092 + hostPort: 9092 + protocol: TCP + - containerPort: 9094 + hostPort: 9094 + protocol: TCP + restartPolicy: Always diff --git a/utils/helm/cluster/templates/broker-service.yaml b/utils/helm/cluster/templates/broker-service.yaml new file mode 100644 index 0000000..c38344d --- /dev/null +++ b/utils/helm/cluster/templates/broker-service.yaml @@ -0,0 +1,19 @@ +apiVersion: v1 +kind: Service +metadata: + annotations: + kompose.cmd: kompose -f docker-compose.yml convert -c + kompose.version: 1.33.0 (3ce457399) + labels: + io.kompose.service: broker + name: broker +spec: + ports: + - name: "9092" + port: 9092 + targetPort: 9092 + - name: "9094" + port: 9094 + targetPort: 9094 + selector: + io.kompose.service: broker diff --git a/utils/helm/cluster/templates/clickhouse-01-cm0-configmap.yaml b/utils/helm/cluster/templates/clickhouse-01-cm0-configmap.yaml deleted file mode 100644 index 646c295..0000000 --- a/utils/helm/cluster/templates/clickhouse-01-cm0-configmap.yaml +++ /dev/null @@ -1,78 +0,0 @@ -apiVersion: v1 -data: - config.xml: | - - - debug - /var/log/clickhouse-server/clickhouse-server.log - /var/log/clickhouse-server/clickhouse-server.err.log - 1000M - 3 - - cluster_2S_2R node 1 - 0.0.0.0 - 8123 - 9000 - - - users.xml - - - /var/lib/clickhouse/access/ - - - - /clickhouse/task_queue/ddl - - - - - true - - clickhouse-01 - 9000 - - - clickhouse-03 - 9000 - - - - true - - clickhouse-02 - 9000 - - - clickhouse-04 - 9000 - - - - - - - clickhouse-keeper-01 - 9181 - - - clickhouse-keeper-02 - 9181 - - - clickhouse-keeper-03 - 9181 - - - - 01 - 01 - - -kind: ConfigMap -metadata: - annotations: - use-subpath: "true" - labels: - io.kompose.service: clickhouse-01 - name: clickhouse-01-cm0 diff --git a/utils/helm/cluster/templates/clickhouse-01-cm1-configmap.yaml b/utils/helm/cluster/templates/clickhouse-01-cm1-configmap.yaml deleted file mode 100644 index 6d8b5dd..0000000 --- a/utils/helm/cluster/templates/clickhouse-01-cm1-configmap.yaml +++ /dev/null @@ -1,47 +0,0 @@ -apiVersion: v1 -data: - users.xml: | - - - - - 10000000000 - 0 - in_order - 1 - - - - - 1 - default - - ::/0 - - default - 1 - 1 - 1 - 1 - - - - - - 3600 - 0 - 0 - 0 - 0 - 0 - - - - -kind: ConfigMap -metadata: - annotations: - use-subpath: "true" - labels: - io.kompose.service: clickhouse-01 - name: clickhouse-01-cm1 diff --git a/utils/helm/cluster/templates/clickhouse-01-deployment.yaml b/utils/helm/cluster/templates/clickhouse-01-deployment.yaml deleted file mode 100644 index cb583e3..0000000 --- a/utils/helm/cluster/templates/clickhouse-01-deployment.yaml +++ /dev/null @@ -1,59 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - annotations: - kompose.cmd: kompose convert -f docker-compose-citus.yml -c -o patroni-compose - kompose.version: 1.33.0 (3ce457399) - labels: - io.kompose.service: clickhouse-01 - name: clickhouse-01 -spec: - replicas: 1 - selector: - matchLabels: - io.kompose.service: clickhouse-01 - strategy: - type: Recreate - template: - metadata: - annotations: - kompose.cmd: kompose convert -f docker-compose-citus.yml -c -o patroni-compose - kompose.version: 1.33.0 (3ce457399) - labels: - io.kompose.network/patroni-default: "true" - io.kompose.service: clickhouse-01 - spec: - containers: - - image: clickhouse/clickhouse-server:latest - name: clickhouse-01 - ports: - - containerPort: 8123 - hostIP: 127.0.0.1 - hostPort: 8123 - protocol: TCP - - containerPort: 9000 - hostIP: 127.0.0.1 - hostPort: 9000 - protocol: TCP - volumeMounts: - - mountPath: /etc/clickhouse-server/config.d/config.xml - name: clickhouse-01-cm0 - subPath: config.xml - - mountPath: /etc/clickhouse-server/users.d/users.xml - name: clickhouse-01-cm1 - subPath: users.xml - hostname: clickhouse-01 - restartPolicy: Always - volumes: - - configMap: - items: - - key: config.xml - path: config.xml - name: clickhouse-01-cm0 - name: clickhouse-01-cm0 - - configMap: - items: - - key: users.xml - path: users.xml - name: clickhouse-01-cm1 - name: clickhouse-01-cm1 diff --git a/utils/helm/cluster/templates/clickhouse-01-service.yaml b/utils/helm/cluster/templates/clickhouse-01-service.yaml deleted file mode 100644 index b53a448..0000000 --- a/utils/helm/cluster/templates/clickhouse-01-service.yaml +++ /dev/null @@ -1,19 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - annotations: - kompose.cmd: kompose convert -f docker-compose-citus.yml -c -o patroni-compose - kompose.version: 1.33.0 (3ce457399) - labels: - io.kompose.service: clickhouse-01 - name: clickhouse-01 -spec: - ports: - - name: "8123" - port: 8123 - targetPort: 8123 - - name: "9000" - port: 9000 - targetPort: 9000 - selector: - io.kompose.service: clickhouse-01 diff --git a/utils/helm/cluster/templates/clickhouse-02-cm0-configmap.yaml b/utils/helm/cluster/templates/clickhouse-02-cm0-configmap.yaml deleted file mode 100644 index 6ce0794..0000000 --- a/utils/helm/cluster/templates/clickhouse-02-cm0-configmap.yaml +++ /dev/null @@ -1,78 +0,0 @@ -apiVersion: v1 -data: - config.xml: | - - - debug - /var/log/clickhouse-server/clickhouse-server.log - /var/log/clickhouse-server/clickhouse-server.err.log - 1000M - 3 - - cluster_2S_2R node 2 - 0.0.0.0 - 8123 - 9000 - - - users.xml - - - /var/lib/clickhouse/access/ - - - - /clickhouse/task_queue/ddl - - - - - true - - clickhouse-01 - 9000 - - - clickhouse-03 - 9000 - - - - true - - clickhouse-02 - 9000 - - - clickhouse-04 - 9000 - - - - - - - clickhouse-keeper-01 - 9181 - - - clickhouse-keeper-02 - 9181 - - - clickhouse-keeper-03 - 9181 - - - - 02 - 01 - - -kind: ConfigMap -metadata: - annotations: - use-subpath: "true" - labels: - io.kompose.service: clickhouse-02 - name: clickhouse-02-cm0 diff --git a/utils/helm/cluster/templates/clickhouse-02-cm1-configmap.yaml b/utils/helm/cluster/templates/clickhouse-02-cm1-configmap.yaml deleted file mode 100644 index 8a128be..0000000 --- a/utils/helm/cluster/templates/clickhouse-02-cm1-configmap.yaml +++ /dev/null @@ -1,47 +0,0 @@ -apiVersion: v1 -data: - users.xml: | - - - - - 10000000000 - 0 - in_order - 1 - - - - - 1 - default - - ::/0 - - default - 1 - 1 - 1 - 1 - - - - - - 3600 - 0 - 0 - 0 - 0 - 0 - - - - -kind: ConfigMap -metadata: - annotations: - use-subpath: "true" - labels: - io.kompose.service: clickhouse-02 - name: clickhouse-02-cm1 diff --git a/utils/helm/cluster/templates/clickhouse-02-deployment.yaml b/utils/helm/cluster/templates/clickhouse-02-deployment.yaml deleted file mode 100644 index 9beaf27..0000000 --- a/utils/helm/cluster/templates/clickhouse-02-deployment.yaml +++ /dev/null @@ -1,59 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - annotations: - kompose.cmd: kompose convert -f docker-compose-citus.yml -c -o patroni-compose - kompose.version: 1.33.0 (3ce457399) - labels: - io.kompose.service: clickhouse-02 - name: clickhouse-02 -spec: - replicas: 1 - selector: - matchLabels: - io.kompose.service: clickhouse-02 - strategy: - type: Recreate - template: - metadata: - annotations: - kompose.cmd: kompose convert -f docker-compose-citus.yml -c -o patroni-compose - kompose.version: 1.33.0 (3ce457399) - labels: - io.kompose.network/patroni-default: "true" - io.kompose.service: clickhouse-02 - spec: - containers: - - image: clickhouse/clickhouse-server:latest - name: clickhouse-02 - ports: - - containerPort: 8123 - hostIP: 127.0.0.1 - hostPort: 8124 - protocol: TCP - - containerPort: 9000 - hostIP: 127.0.0.1 - hostPort: 9001 - protocol: TCP - volumeMounts: - - mountPath: /etc/clickhouse-server/config.d/config.xml - name: clickhouse-02-cm0 - subPath: config.xml - - mountPath: /etc/clickhouse-server/users.d/users.xml - name: clickhouse-02-cm1 - subPath: users.xml - hostname: clickhouse-02 - restartPolicy: Always - volumes: - - configMap: - items: - - key: config.xml - path: config.xml - name: clickhouse-02-cm0 - name: clickhouse-02-cm0 - - configMap: - items: - - key: users.xml - path: users.xml - name: clickhouse-02-cm1 - name: clickhouse-02-cm1 diff --git a/utils/helm/cluster/templates/clickhouse-02-service.yaml b/utils/helm/cluster/templates/clickhouse-02-service.yaml deleted file mode 100644 index 6e1f45e..0000000 --- a/utils/helm/cluster/templates/clickhouse-02-service.yaml +++ /dev/null @@ -1,19 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - annotations: - kompose.cmd: kompose convert -f docker-compose-citus.yml -c -o patroni-compose - kompose.version: 1.33.0 (3ce457399) - labels: - io.kompose.service: clickhouse-02 - name: clickhouse-02 -spec: - ports: - - name: "8124" - port: 8124 - targetPort: 8123 - - name: "9001" - port: 9001 - targetPort: 9000 - selector: - io.kompose.service: clickhouse-02 diff --git a/utils/helm/cluster/templates/clickhouse-03-cm0-configmap.yaml b/utils/helm/cluster/templates/clickhouse-03-cm0-configmap.yaml deleted file mode 100644 index 1a6e835..0000000 --- a/utils/helm/cluster/templates/clickhouse-03-cm0-configmap.yaml +++ /dev/null @@ -1,78 +0,0 @@ -apiVersion: v1 -data: - config.xml: | - - - debug - /var/log/clickhouse-server/clickhouse-server.log - /var/log/clickhouse-server/clickhouse-server.err.log - 1000M - 3 - - cluster_2S_2R node 3 - 0.0.0.0 - 8123 - 9000 - - - users.xml - - - /var/lib/clickhouse/access/ - - - - /clickhouse/task_queue/ddl - - - - - true - - clickhouse-01 - 9000 - - - clickhouse-03 - 9000 - - - - true - - clickhouse-02 - 9000 - - - clickhouse-04 - 9000 - - - - - - - clickhouse-keeper-01 - 9181 - - - clickhouse-keeper-02 - 9181 - - - clickhouse-keeper-03 - 9181 - - - - 01 - 02 - - -kind: ConfigMap -metadata: - annotations: - use-subpath: "true" - labels: - io.kompose.service: clickhouse-03 - name: clickhouse-03-cm0 diff --git a/utils/helm/cluster/templates/clickhouse-03-cm1-configmap.yaml b/utils/helm/cluster/templates/clickhouse-03-cm1-configmap.yaml deleted file mode 100644 index f7becd4..0000000 --- a/utils/helm/cluster/templates/clickhouse-03-cm1-configmap.yaml +++ /dev/null @@ -1,47 +0,0 @@ -apiVersion: v1 -data: - users.xml: | - - - - - 10000000000 - 0 - in_order - 1 - - - - - 1 - default - - ::/0 - - default - 1 - 1 - 1 - 1 - - - - - - 3600 - 0 - 0 - 0 - 0 - 0 - - - - -kind: ConfigMap -metadata: - annotations: - use-subpath: "true" - labels: - io.kompose.service: clickhouse-03 - name: clickhouse-03-cm1 diff --git a/utils/helm/cluster/templates/clickhouse-03-deployment.yaml b/utils/helm/cluster/templates/clickhouse-03-deployment.yaml deleted file mode 100644 index 2299c68..0000000 --- a/utils/helm/cluster/templates/clickhouse-03-deployment.yaml +++ /dev/null @@ -1,59 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - annotations: - kompose.cmd: kompose convert -f docker-compose-citus.yml -c -o patroni-compose - kompose.version: 1.33.0 (3ce457399) - labels: - io.kompose.service: clickhouse-03 - name: clickhouse-03 -spec: - replicas: 1 - selector: - matchLabels: - io.kompose.service: clickhouse-03 - strategy: - type: Recreate - template: - metadata: - annotations: - kompose.cmd: kompose convert -f docker-compose-citus.yml -c -o patroni-compose - kompose.version: 1.33.0 (3ce457399) - labels: - io.kompose.network/patroni-default: "true" - io.kompose.service: clickhouse-03 - spec: - containers: - - image: clickhouse/clickhouse-server:latest - name: clickhouse-03 - ports: - - containerPort: 8123 - hostIP: 127.0.0.1 - hostPort: 8125 - protocol: TCP - - containerPort: 9000 - hostIP: 127.0.0.1 - hostPort: 9002 - protocol: TCP - volumeMounts: - - mountPath: /etc/clickhouse-server/config.d/config.xml - name: clickhouse-03-cm0 - subPath: config.xml - - mountPath: /etc/clickhouse-server/users.d/users.xml - name: clickhouse-03-cm1 - subPath: users.xml - hostname: clickhouse-03 - restartPolicy: Always - volumes: - - configMap: - items: - - key: config.xml - path: config.xml - name: clickhouse-03-cm0 - name: clickhouse-03-cm0 - - configMap: - items: - - key: users.xml - path: users.xml - name: clickhouse-03-cm1 - name: clickhouse-03-cm1 diff --git a/utils/helm/cluster/templates/clickhouse-03-service.yaml b/utils/helm/cluster/templates/clickhouse-03-service.yaml deleted file mode 100644 index 8fb0e62..0000000 --- a/utils/helm/cluster/templates/clickhouse-03-service.yaml +++ /dev/null @@ -1,19 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - annotations: - kompose.cmd: kompose convert -f docker-compose-citus.yml -c -o patroni-compose - kompose.version: 1.33.0 (3ce457399) - labels: - io.kompose.service: clickhouse-03 - name: clickhouse-03 -spec: - ports: - - name: "8125" - port: 8125 - targetPort: 8123 - - name: "9002" - port: 9002 - targetPort: 9000 - selector: - io.kompose.service: clickhouse-03 diff --git a/utils/helm/cluster/templates/clickhouse-keeper-01-cm0-configmap.yaml b/utils/helm/cluster/templates/clickhouse-keeper-01-cm0-configmap.yaml deleted file mode 100644 index 3d006b7..0000000 --- a/utils/helm/cluster/templates/clickhouse-keeper-01-cm0-configmap.yaml +++ /dev/null @@ -1,48 +0,0 @@ -apiVersion: v1 -data: - keeper_config.xml: | - - - information - /var/log/clickhouse-keeper/clickhouse-keeper.log - /var/log/clickhouse-keeper/clickhouse-keeper.err.log - 1000M - 3 - - 0.0.0.0 - - 9181 - 1 - /var/lib/clickhouse/coordination/log - /var/lib/clickhouse/coordination/snapshots - - 10000 - 30000 - information - - - - 1 - clickhouse-keeper-01 - 9234 - - - 2 - clickhouse-keeper-02 - 9234 - - - 3 - clickhouse-keeper-03 - 9234 - - - - -kind: ConfigMap -metadata: - annotations: - use-subpath: "true" - labels: - io.kompose.service: clickhouse-keeper-01 - name: clickhouse-keeper-01-cm0 diff --git a/utils/helm/cluster/templates/clickhouse-keeper-01-deployment.yaml b/utils/helm/cluster/templates/clickhouse-keeper-01-deployment.yaml deleted file mode 100644 index c68e47d..0000000 --- a/utils/helm/cluster/templates/clickhouse-keeper-01-deployment.yaml +++ /dev/null @@ -1,46 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - annotations: - kompose.cmd: kompose convert -f docker-compose-citus.yml -c -o patroni-compose - kompose.version: 1.33.0 (3ce457399) - labels: - io.kompose.service: clickhouse-keeper-01 - name: clickhouse-keeper-01 -spec: - replicas: 1 - selector: - matchLabels: - io.kompose.service: clickhouse-keeper-01 - strategy: - type: Recreate - template: - metadata: - annotations: - kompose.cmd: kompose convert -f docker-compose-citus.yml -c -o patroni-compose - kompose.version: 1.33.0 (3ce457399) - labels: - io.kompose.network/patroni-default: "true" - io.kompose.service: clickhouse-keeper-01 - spec: - containers: - - image: clickhouse/clickhouse-keeper:latest-alpine - name: clickhouse-keeper-01 - ports: - - containerPort: 9181 - hostIP: 127.0.0.1 - hostPort: 9181 - protocol: TCP - volumeMounts: - - mountPath: /etc/clickhouse-keeper/keeper_config.xml - name: clickhouse-keeper-01-cm0 - subPath: keeper_config.xml - hostname: clickhouse-keeper-01 - restartPolicy: Always - volumes: - - configMap: - items: - - key: keeper_config.xml - path: keeper_config.xml - name: clickhouse-keeper-01-cm0 - name: clickhouse-keeper-01-cm0 diff --git a/utils/helm/cluster/templates/clickhouse-keeper-01-service.yaml b/utils/helm/cluster/templates/clickhouse-keeper-01-service.yaml deleted file mode 100644 index bbaf64e..0000000 --- a/utils/helm/cluster/templates/clickhouse-keeper-01-service.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - annotations: - kompose.cmd: kompose convert -f docker-compose-citus.yml -c -o patroni-compose - kompose.version: 1.33.0 (3ce457399) - labels: - io.kompose.service: clickhouse-keeper-01 - name: clickhouse-keeper-01 -spec: - ports: - - name: "9181" - port: 9181 - targetPort: 9181 - selector: - io.kompose.service: clickhouse-keeper-01 diff --git a/utils/helm/cluster/templates/clickhouse-keeper-02-cm0-configmap.yaml b/utils/helm/cluster/templates/clickhouse-keeper-02-cm0-configmap.yaml deleted file mode 100644 index e9dfbcf..0000000 --- a/utils/helm/cluster/templates/clickhouse-keeper-02-cm0-configmap.yaml +++ /dev/null @@ -1,48 +0,0 @@ -apiVersion: v1 -data: - keeper_config.xml: | - - - information - /var/log/clickhouse-keeper/clickhouse-keeper.log - /var/log/clickhouse-keeper/clickhouse-keeper.err.log - 1000M - 3 - - 0.0.0.0 - - 9181 - 2 - /var/lib/clickhouse/coordination/log - /var/lib/clickhouse/coordination/snapshots - - 10000 - 30000 - information - - - - 1 - clickhouse-keeper-01 - 9234 - - - 2 - clickhouse-keeper-02 - 9234 - - - 3 - clickhouse-keeper-03 - 9234 - - - - -kind: ConfigMap -metadata: - annotations: - use-subpath: "true" - labels: - io.kompose.service: clickhouse-keeper-02 - name: clickhouse-keeper-02-cm0 diff --git a/utils/helm/cluster/templates/clickhouse-keeper-02-deployment.yaml b/utils/helm/cluster/templates/clickhouse-keeper-02-deployment.yaml deleted file mode 100644 index 09f073f..0000000 --- a/utils/helm/cluster/templates/clickhouse-keeper-02-deployment.yaml +++ /dev/null @@ -1,46 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - annotations: - kompose.cmd: kompose convert -f docker-compose-citus.yml -c -o patroni-compose - kompose.version: 1.33.0 (3ce457399) - labels: - io.kompose.service: clickhouse-keeper-02 - name: clickhouse-keeper-02 -spec: - replicas: 1 - selector: - matchLabels: - io.kompose.service: clickhouse-keeper-02 - strategy: - type: Recreate - template: - metadata: - annotations: - kompose.cmd: kompose convert -f docker-compose-citus.yml -c -o patroni-compose - kompose.version: 1.33.0 (3ce457399) - labels: - io.kompose.network/patroni-default: "true" - io.kompose.service: clickhouse-keeper-02 - spec: - containers: - - image: clickhouse/clickhouse-keeper:latest-alpine - name: clickhouse-keeper-02 - ports: - - containerPort: 9181 - hostIP: 127.0.0.1 - hostPort: 9182 - protocol: TCP - volumeMounts: - - mountPath: /etc/clickhouse-keeper/keeper_config.xml - name: clickhouse-keeper-02-cm0 - subPath: keeper_config.xml - hostname: clickhouse-keeper-02 - restartPolicy: Always - volumes: - - configMap: - items: - - key: keeper_config.xml - path: keeper_config.xml - name: clickhouse-keeper-02-cm0 - name: clickhouse-keeper-02-cm0 diff --git a/utils/helm/cluster/templates/clickhouse-keeper-02-service.yaml b/utils/helm/cluster/templates/clickhouse-keeper-02-service.yaml deleted file mode 100644 index 866ea02..0000000 --- a/utils/helm/cluster/templates/clickhouse-keeper-02-service.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - annotations: - kompose.cmd: kompose convert -f docker-compose-citus.yml -c -o patroni-compose - kompose.version: 1.33.0 (3ce457399) - labels: - io.kompose.service: clickhouse-keeper-02 - name: clickhouse-keeper-02 -spec: - ports: - - name: "9182" - port: 9182 - targetPort: 9181 - selector: - io.kompose.service: clickhouse-keeper-02 diff --git a/utils/helm/cluster/templates/clickhouse-keeper-03-cm0-configmap.yaml b/utils/helm/cluster/templates/clickhouse-keeper-03-cm0-configmap.yaml deleted file mode 100644 index 23d9c5a..0000000 --- a/utils/helm/cluster/templates/clickhouse-keeper-03-cm0-configmap.yaml +++ /dev/null @@ -1,48 +0,0 @@ -apiVersion: v1 -data: - keeper_config.xml: | - - - information - /var/log/clickhouse-keeper/clickhouse-keeper.log - /var/log/clickhouse-keeper/clickhouse-keeper.err.log - 1000M - 3 - - 0.0.0.0 - - 9181 - 3 - /var/lib/clickhouse/coordination/log - /var/lib/clickhouse/coordination/snapshots - - 10000 - 30000 - information - - - - 1 - clickhouse-keeper-01 - 9234 - - - 2 - clickhouse-keeper-02 - 9234 - - - 3 - clickhouse-keeper-03 - 9234 - - - - -kind: ConfigMap -metadata: - annotations: - use-subpath: "true" - labels: - io.kompose.service: clickhouse-keeper-03 - name: clickhouse-keeper-03-cm0 diff --git a/utils/helm/cluster/templates/clickhouse-keeper-03-deployment.yaml b/utils/helm/cluster/templates/clickhouse-keeper-03-deployment.yaml deleted file mode 100644 index e1f6b87..0000000 --- a/utils/helm/cluster/templates/clickhouse-keeper-03-deployment.yaml +++ /dev/null @@ -1,46 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - annotations: - kompose.cmd: kompose convert -f docker-compose-citus.yml -c -o patroni-compose - kompose.version: 1.33.0 (3ce457399) - labels: - io.kompose.service: clickhouse-keeper-03 - name: clickhouse-keeper-03 -spec: - replicas: 1 - selector: - matchLabels: - io.kompose.service: clickhouse-keeper-03 - strategy: - type: Recreate - template: - metadata: - annotations: - kompose.cmd: kompose convert -f docker-compose-citus.yml -c -o patroni-compose - kompose.version: 1.33.0 (3ce457399) - labels: - io.kompose.network/patroni-default: "true" - io.kompose.service: clickhouse-keeper-03 - spec: - containers: - - image: clickhouse/clickhouse-keeper:latest-alpine - name: clickhouse-keeper-03 - ports: - - containerPort: 9181 - hostIP: 127.0.0.1 - hostPort: 9183 - protocol: TCP - volumeMounts: - - mountPath: /etc/clickhouse-keeper/keeper_config.xml - name: clickhouse-keeper-03-cm0 - subPath: keeper_config.xml - hostname: clickhouse-keeper-03 - restartPolicy: Always - volumes: - - configMap: - items: - - key: keeper_config.xml - path: keeper_config.xml - name: clickhouse-keeper-03-cm0 - name: clickhouse-keeper-03-cm0 diff --git a/utils/helm/cluster/templates/clickhouse-keeper-03-service.yaml b/utils/helm/cluster/templates/clickhouse-keeper-03-service.yaml deleted file mode 100644 index b1460a9..0000000 --- a/utils/helm/cluster/templates/clickhouse-keeper-03-service.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - annotations: - kompose.cmd: kompose convert -f docker-compose-citus.yml -c -o patroni-compose - kompose.version: 1.33.0 (3ce457399) - labels: - io.kompose.service: clickhouse-keeper-03 - name: clickhouse-keeper-03 -spec: - ports: - - name: "9183" - port: 9183 - targetPort: 9181 - selector: - io.kompose.service: clickhouse-keeper-03 diff --git a/utils/helm/cluster/templates/etcd1-deployment.yaml b/utils/helm/cluster/templates/etcd1-deployment.yaml index 1b95ab7..dd5bb92 100644 --- a/utils/helm/cluster/templates/etcd1-deployment.yaml +++ b/utils/helm/cluster/templates/etcd1-deployment.yaml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - kompose.cmd: kompose convert -f docker-compose-citus.yml -c -o patroni-compose + kompose.cmd: kompose -f docker-compose.yml convert -c kompose.version: 1.33.0 (3ce457399) labels: io.kompose.service: etcd1 @@ -15,7 +15,7 @@ spec: template: metadata: annotations: - kompose.cmd: kompose convert -f docker-compose-citus.yml -c -o patroni-compose + kompose.cmd: kompose -f docker-compose.yml convert -c kompose.version: 1.33.0 (3ce457399) labels: io.kompose.network/patroni-demo: "true" @@ -41,7 +41,7 @@ spec: value: http://0.0.0.0:2380 - name: ETCD_UNSUPPORTED_ARCH value: arm64 - image: harbor.io.optimcloud.com/optimcloud/patroni-citus:latest + image: harbor.io.optimcloud.com/optimcloud/patroni:latest name: demo-etcd1 ports: - containerPort: 2379 diff --git a/utils/helm/cluster/templates/etcd1-service.yaml b/utils/helm/cluster/templates/etcd1-service.yaml index 354ca77..5c2d5bd 100644 --- a/utils/helm/cluster/templates/etcd1-service.yaml +++ b/utils/helm/cluster/templates/etcd1-service.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Service metadata: annotations: - kompose.cmd: kompose convert -f docker-compose-citus.yml -c -o patroni-compose + kompose.cmd: kompose -f docker-compose.yml convert -c kompose.version: 1.33.0 (3ce457399) labels: io.kompose.service: etcd1 diff --git a/utils/helm/cluster/templates/etcd2-deployment.yaml b/utils/helm/cluster/templates/etcd2-deployment.yaml index d5a3d03..5ad4bd6 100644 --- a/utils/helm/cluster/templates/etcd2-deployment.yaml +++ b/utils/helm/cluster/templates/etcd2-deployment.yaml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - kompose.cmd: kompose convert -f docker-compose-citus.yml -c -o patroni-compose + kompose.cmd: kompose -f docker-compose.yml convert -c kompose.version: 1.33.0 (3ce457399) labels: io.kompose.service: etcd2 @@ -15,7 +15,7 @@ spec: template: metadata: annotations: - kompose.cmd: kompose convert -f docker-compose-citus.yml -c -o patroni-compose + kompose.cmd: kompose -f docker-compose.yml convert -c kompose.version: 1.33.0 (3ce457399) labels: io.kompose.network/patroni-demo: "true" @@ -41,7 +41,7 @@ spec: value: http://0.0.0.0:2380 - name: ETCD_UNSUPPORTED_ARCH value: arm64 - image: harbor.io.optimcloud.com/optimcloud/patroni-citus:latest + image: harbor.io.optimcloud.com/optimcloud/patroni:latest name: demo-etcd2 ports: - containerPort: 2379 diff --git a/utils/helm/cluster/templates/etcd2-service.yaml b/utils/helm/cluster/templates/etcd2-service.yaml index b09dea6..75128fe 100644 --- a/utils/helm/cluster/templates/etcd2-service.yaml +++ b/utils/helm/cluster/templates/etcd2-service.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Service metadata: annotations: - kompose.cmd: kompose convert -f docker-compose-citus.yml -c -o patroni-compose + kompose.cmd: kompose -f docker-compose.yml convert -c kompose.version: 1.33.0 (3ce457399) labels: io.kompose.service: etcd2 diff --git a/utils/helm/cluster/templates/etcd3-deployment.yaml b/utils/helm/cluster/templates/etcd3-deployment.yaml index 165f162..60400b6 100644 --- a/utils/helm/cluster/templates/etcd3-deployment.yaml +++ b/utils/helm/cluster/templates/etcd3-deployment.yaml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - kompose.cmd: kompose convert -f docker-compose-citus.yml -c -o patroni-compose + kompose.cmd: kompose -f docker-compose.yml convert -c kompose.version: 1.33.0 (3ce457399) labels: io.kompose.service: etcd3 @@ -15,7 +15,7 @@ spec: template: metadata: annotations: - kompose.cmd: kompose convert -f docker-compose-citus.yml -c -o patroni-compose + kompose.cmd: kompose -f docker-compose.yml convert -c kompose.version: 1.33.0 (3ce457399) labels: io.kompose.network/patroni-demo: "true" @@ -41,7 +41,7 @@ spec: value: http://0.0.0.0:2380 - name: ETCD_UNSUPPORTED_ARCH value: arm64 - image: harbor.io.optimcloud.com/optimcloud/patroni-citus:latest + image: harbor.io.optimcloud.com/optimcloud/patroni:latest name: demo-etcd3 ports: - containerPort: 2379 diff --git a/utils/helm/cluster/templates/etcd3-service.yaml b/utils/helm/cluster/templates/etcd3-service.yaml index 4ac4939..7230193 100644 --- a/utils/helm/cluster/templates/etcd3-service.yaml +++ b/utils/helm/cluster/templates/etcd3-service.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Service metadata: annotations: - kompose.cmd: kompose convert -f docker-compose-citus.yml -c -o patroni-compose + kompose.cmd: kompose -f docker-compose.yml convert -c kompose.version: 1.33.0 (3ce457399) labels: io.kompose.service: etcd3 diff --git a/utils/helm/cluster/templates/haproxy-deployment.yaml b/utils/helm/cluster/templates/haproxy-deployment.yaml index 2ccf4fd..8e43a99 100644 --- a/utils/helm/cluster/templates/haproxy-deployment.yaml +++ b/utils/helm/cluster/templates/haproxy-deployment.yaml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - kompose.cmd: kompose convert -f docker-compose-citus.yml -c -o patroni-compose + kompose.cmd: kompose -f docker-compose.yml convert -c kompose.version: 1.33.0 (3ce457399) labels: io.kompose.service: haproxy @@ -15,7 +15,7 @@ spec: template: metadata: annotations: - kompose.cmd: kompose convert -f docker-compose-citus.yml -c -o patroni-compose + kompose.cmd: kompose -f docker-compose.yml convert -c kompose.version: 1.33.0 (3ce457399) labels: io.kompose.network/patroni-demo: "true" @@ -27,10 +27,6 @@ spec: env: - name: ETCDCTL_ENDPOINTS value: http://etcd1:2379,http://etcd2:2379,http://etcd3:2379 - - name: PATRONI_CITUS_DATABASE - value: citus - - name: PATRONI_CITUS_GROUP - value: "0" - name: PATRONI_ETCD3_HOSTS value: '''etcd1:2379'',''etcd2:2379'',''etcd3:2379''' - name: PATRONI_REPLICATION_PASSWORD @@ -75,15 +71,7 @@ spec: configMapKeyRef: key: PATRONI_admin_PASSWORD name: patroni-env - - name: PGSSLCERT - value: /etc/ssl/certs/ssl-cert-snakeoil.pem - - name: PGSSLKEY - value: /etc/ssl/private/ssl-cert-snakeoil.key - - name: PGSSLMODE - value: verify-ca - - name: PGSSLROOTCERT - value: /etc/ssl/certs/ssl-cert-snakeoil.pem - image: harbor.io.optimcloud.com/optimcloud/patroni-citus:latest + image: harbor.io.optimcloud.com/optimcloud/patroni:latest name: demo-haproxy ports: - containerPort: 5000 diff --git a/utils/helm/cluster/templates/haproxy-service.yaml b/utils/helm/cluster/templates/haproxy-service.yaml index a859705..7dcba74 100644 --- a/utils/helm/cluster/templates/haproxy-service.yaml +++ b/utils/helm/cluster/templates/haproxy-service.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Service metadata: annotations: - kompose.cmd: kompose convert -f docker-compose-citus.yml -c -o patroni-compose + kompose.cmd: kompose -f docker-compose.yml convert -c kompose.version: 1.33.0 (3ce457399) labels: io.kompose.service: haproxy diff --git a/utils/helm/cluster/templates/patroni-env-configmap.yaml b/utils/helm/cluster/templates/patroni-env-configmap.yaml index e22c69c..8534afb 100644 --- a/utils/helm/cluster/templates/patroni-env-configmap.yaml +++ b/utils/helm/cluster/templates/patroni-env-configmap.yaml @@ -11,5 +11,5 @@ data: kind: ConfigMap metadata: labels: - io.kompose.service: coord1-patroni-env + io.kompose.service: haproxy-patroni-env name: patroni-env diff --git a/utils/helm/cluster/templates/patroni1-claim0-persistentvolumeclaim.yaml b/utils/helm/cluster/templates/patroni1-claim0-persistentvolumeclaim.yaml new file mode 100644 index 0000000..58a7b09 --- /dev/null +++ b/utils/helm/cluster/templates/patroni1-claim0-persistentvolumeclaim.yaml @@ -0,0 +1,12 @@ +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + labels: + io.kompose.service: patroni1-claim0 + name: patroni1-claim0 +spec: + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 100Mi diff --git a/utils/helm/cluster/templates/coord2-deployment.yaml b/utils/helm/cluster/templates/patroni1-deployment.yaml similarity index 71% rename from utils/helm/cluster/templates/coord2-deployment.yaml rename to utils/helm/cluster/templates/patroni1-deployment.yaml index 4d77681..aa66477 100644 --- a/utils/helm/cluster/templates/coord2-deployment.yaml +++ b/utils/helm/cluster/templates/patroni1-deployment.yaml @@ -2,37 +2,35 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - kompose.cmd: kompose convert -f docker-compose-citus.yml -c -o patroni-compose + kompose.cmd: kompose -f docker-compose.yml convert -c kompose.version: 1.33.0 (3ce457399) labels: - io.kompose.service: coord2 - name: coord2 + io.kompose.service: patroni1 + name: patroni1 spec: replicas: 1 selector: matchLabels: - io.kompose.service: coord2 + io.kompose.service: patroni1 + strategy: + type: Recreate template: metadata: annotations: - kompose.cmd: kompose convert -f docker-compose-citus.yml -c -o patroni-compose + kompose.cmd: kompose -f docker-compose.yml convert -c kompose.version: 1.33.0 (3ce457399) labels: io.kompose.network/patroni-demo: "true" - io.kompose.service: coord2 + io.kompose.service: patroni1 spec: containers: - env: - name: ETCDCTL_ENDPOINTS value: http://etcd1:2379,http://etcd2:2379,http://etcd3:2379 - - name: PATRONI_CITUS_DATABASE - value: citus - - name: PATRONI_CITUS_GROUP - value: "0" - name: PATRONI_ETCD3_HOSTS value: '''etcd1:2379'',''etcd2:2379'',''etcd3:2379''' - name: PATRONI_NAME - value: coord2 + value: patroni1 - name: PATRONI_REPLICATION_PASSWORD valueFrom: configMapKeyRef: @@ -75,18 +73,17 @@ spec: configMapKeyRef: key: PATRONI_admin_PASSWORD name: patroni-env - - name: PGSSLCERT - value: /etc/ssl/certs/ssl-cert-snakeoil.pem - - name: PGSSLKEY - value: /etc/ssl/private/ssl-cert-snakeoil.key - - name: PGSSLMODE - value: verify-ca - - name: PGSSLROOTCERT - value: /etc/ssl/certs/ssl-cert-snakeoil.pem - image: harbor.io.optimcloud.com/optimcloud/patroni-citus:latest - name: demo-coord2 + image: harbor.io.optimcloud.com/optimcloud/patroni:latest + name: demo-patroni1 ports: - containerPort: 5432 protocol: TCP - hostname: coord2 + volumeMounts: + - mountPath: /docker-entrypoint-initdb.d/init-db.sh + name: patroni1-claim0 + hostname: patroni1 restartPolicy: Always + volumes: + - name: patroni1-claim0 + persistentVolumeClaim: + claimName: patroni1-claim0 diff --git a/utils/helm/cluster/templates/coord2-service.yaml b/utils/helm/cluster/templates/patroni1-service.yaml similarity index 54% rename from utils/helm/cluster/templates/coord2-service.yaml rename to utils/helm/cluster/templates/patroni1-service.yaml index 7e11fd8..7c6ad62 100644 --- a/utils/helm/cluster/templates/coord2-service.yaml +++ b/utils/helm/cluster/templates/patroni1-service.yaml @@ -2,15 +2,15 @@ apiVersion: v1 kind: Service metadata: annotations: - kompose.cmd: kompose convert -f docker-compose-citus.yml -c -o patroni-compose + kompose.cmd: kompose -f docker-compose.yml convert -c kompose.version: 1.33.0 (3ce457399) labels: - io.kompose.service: coord2 - name: coord2 + io.kompose.service: patroni1 + name: patroni1 spec: ports: - name: "5432" port: 5432 targetPort: 5432 selector: - io.kompose.service: coord2 + io.kompose.service: patroni1 diff --git a/utils/helm/cluster/templates/coord3-deployment.yaml b/utils/helm/cluster/templates/patroni2-deployment.yaml similarity index 71% rename from utils/helm/cluster/templates/coord3-deployment.yaml rename to utils/helm/cluster/templates/patroni2-deployment.yaml index 25dfecc..82338ea 100644 --- a/utils/helm/cluster/templates/coord3-deployment.yaml +++ b/utils/helm/cluster/templates/patroni2-deployment.yaml @@ -2,37 +2,33 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - kompose.cmd: kompose convert -f docker-compose-citus.yml -c -o patroni-compose + kompose.cmd: kompose -f docker-compose.yml convert -c kompose.version: 1.33.0 (3ce457399) labels: - io.kompose.service: coord3 - name: coord3 + io.kompose.service: patroni2 + name: patroni2 spec: replicas: 1 selector: matchLabels: - io.kompose.service: coord3 + io.kompose.service: patroni2 template: metadata: annotations: - kompose.cmd: kompose convert -f docker-compose-citus.yml -c -o patroni-compose + kompose.cmd: kompose -f docker-compose.yml convert -c kompose.version: 1.33.0 (3ce457399) labels: io.kompose.network/patroni-demo: "true" - io.kompose.service: coord3 + io.kompose.service: patroni2 spec: containers: - env: - name: ETCDCTL_ENDPOINTS value: http://etcd1:2379,http://etcd2:2379,http://etcd3:2379 - - name: PATRONI_CITUS_DATABASE - value: citus - - name: PATRONI_CITUS_GROUP - value: "0" - name: PATRONI_ETCD3_HOSTS value: '''etcd1:2379'',''etcd2:2379'',''etcd3:2379''' - name: PATRONI_NAME - value: coord3 + value: patroni2 - name: PATRONI_REPLICATION_PASSWORD valueFrom: configMapKeyRef: @@ -75,18 +71,10 @@ spec: configMapKeyRef: key: PATRONI_admin_PASSWORD name: patroni-env - - name: PGSSLCERT - value: /etc/ssl/certs/ssl-cert-snakeoil.pem - - name: PGSSLKEY - value: /etc/ssl/private/ssl-cert-snakeoil.key - - name: PGSSLMODE - value: verify-ca - - name: PGSSLROOTCERT - value: /etc/ssl/certs/ssl-cert-snakeoil.pem - image: harbor.io.optimcloud.com/optimcloud/patroni-citus:latest - name: demo-coord3 + image: harbor.io.optimcloud.com/optimcloud/patroni:latest + name: demo-patroni2 ports: - containerPort: 5432 protocol: TCP - hostname: coord3 + hostname: patroni2 restartPolicy: Always diff --git a/utils/helm/cluster/templates/coord3-service.yaml b/utils/helm/cluster/templates/patroni2-service.yaml similarity index 54% rename from utils/helm/cluster/templates/coord3-service.yaml rename to utils/helm/cluster/templates/patroni2-service.yaml index 31e2cd2..a03028b 100644 --- a/utils/helm/cluster/templates/coord3-service.yaml +++ b/utils/helm/cluster/templates/patroni2-service.yaml @@ -2,15 +2,15 @@ apiVersion: v1 kind: Service metadata: annotations: - kompose.cmd: kompose convert -f docker-compose-citus.yml -c -o patroni-compose + kompose.cmd: kompose -f docker-compose.yml convert -c kompose.version: 1.33.0 (3ce457399) labels: - io.kompose.service: coord3 - name: coord3 + io.kompose.service: patroni2 + name: patroni2 spec: ports: - name: "5432" port: 5432 targetPort: 5432 selector: - io.kompose.service: coord3 + io.kompose.service: patroni2 diff --git a/utils/helm/cluster/templates/coord1-deployment.yaml b/utils/helm/cluster/templates/patroni3-deployment.yaml similarity index 72% rename from utils/helm/cluster/templates/coord1-deployment.yaml rename to utils/helm/cluster/templates/patroni3-deployment.yaml index 271ff7e..f41e5e8 100644 --- a/utils/helm/cluster/templates/coord1-deployment.yaml +++ b/utils/helm/cluster/templates/patroni3-deployment.yaml @@ -2,37 +2,33 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - kompose.cmd: kompose convert -f docker-compose-citus.yml -c -o patroni-compose + kompose.cmd: kompose -f docker-compose.yml convert -c kompose.version: 1.33.0 (3ce457399) labels: - io.kompose.service: coord1 - name: coord1 + io.kompose.service: patroni3 + name: patroni3 spec: replicas: 1 selector: matchLabels: - io.kompose.service: coord1 + io.kompose.service: patroni3 template: metadata: annotations: - kompose.cmd: kompose convert -f docker-compose-citus.yml -c -o patroni-compose + kompose.cmd: kompose -f docker-compose.yml convert -c kompose.version: 1.33.0 (3ce457399) labels: io.kompose.network/patroni-demo: "true" - io.kompose.service: coord1 + io.kompose.service: patroni3 spec: containers: - env: - name: ETCDCTL_ENDPOINTS value: http://etcd1:2379,http://etcd2:2379,http://etcd3:2379 - - name: PATRONI_CITUS_DATABASE - value: citus - - name: PATRONI_CITUS_GROUP - value: "0" - name: PATRONI_ETCD3_HOSTS value: '''etcd1:2379'',''etcd2:2379'',''etcd3:2379''' - name: PATRONI_NAME - value: coord1 + value: patroni3 - name: PATRONI_REPLICATION_PASSWORD valueFrom: configMapKeyRef: @@ -75,18 +71,10 @@ spec: configMapKeyRef: key: PATRONI_admin_PASSWORD name: patroni-env - - name: PGSSLCERT - value: /etc/ssl/certs/ssl-cert-snakeoil.pem - - name: PGSSLKEY - value: /etc/ssl/private/ssl-cert-snakeoil.key - - name: PGSSLMODE - value: verify-ca - - name: PGSSLROOTCERT - value: /etc/ssl/certs/ssl-cert-snakeoil.pem - image: harbor.io.optimcloud.com/optimcloud/patroni-citus:latest - name: demo-coord1 + image: harbor.io.optimcloud.com/optimcloud/patroni:latest + name: demo-patroni3 ports: - containerPort: 5432 protocol: TCP - hostname: coord1 + hostname: patroni3 restartPolicy: Always diff --git a/utils/helm/cluster/templates/coord1-service.yaml b/utils/helm/cluster/templates/patroni3-service.yaml similarity index 54% rename from utils/helm/cluster/templates/coord1-service.yaml rename to utils/helm/cluster/templates/patroni3-service.yaml index 317205b..86e68c3 100644 --- a/utils/helm/cluster/templates/coord1-service.yaml +++ b/utils/helm/cluster/templates/patroni3-service.yaml @@ -2,15 +2,15 @@ apiVersion: v1 kind: Service metadata: annotations: - kompose.cmd: kompose convert -f docker-compose-citus.yml -c -o patroni-compose + kompose.cmd: kompose -f docker-compose.yml convert -c kompose.version: 1.33.0 (3ce457399) labels: - io.kompose.service: coord1 - name: coord1 + io.kompose.service: patroni3 + name: patroni3 spec: ports: - name: "5432" port: 5432 targetPort: 5432 selector: - io.kompose.service: coord1 + io.kompose.service: patroni3 diff --git a/utils/helm/cluster/templates/redis-deployment.yaml b/utils/helm/cluster/templates/redis-deployment.yaml new file mode 100644 index 0000000..d6f4aba --- /dev/null +++ b/utils/helm/cluster/templates/redis-deployment.yaml @@ -0,0 +1,34 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + annotations: + kompose.cmd: kompose -f docker-compose.yml convert -c + kompose.version: 1.33.0 (3ce457399) + labels: + io.kompose.service: redis + name: redis +spec: + replicas: 1 + selector: + matchLabels: + io.kompose.service: redis + template: + metadata: + annotations: + kompose.cmd: kompose -f docker-compose.yml convert -c + kompose.version: 1.33.0 (3ce457399) + labels: + io.kompose.network/patroni-default: "true" + io.kompose.service: redis + spec: + containers: + - env: + - name: ALLOW_EMPTY_PASSWORD + value: "yes" + image: bitnami/redis:latest + name: redis + ports: + - containerPort: 6379 + hostPort: 6379 + protocol: TCP + restartPolicy: Always diff --git a/utils/helm/cluster/templates/redis-service.yaml b/utils/helm/cluster/templates/redis-service.yaml new file mode 100644 index 0000000..74a5519 --- /dev/null +++ b/utils/helm/cluster/templates/redis-service.yaml @@ -0,0 +1,16 @@ +apiVersion: v1 +kind: Service +metadata: + annotations: + kompose.cmd: kompose -f docker-compose.yml convert -c + kompose.version: 1.33.0 (3ce457399) + labels: + io.kompose.service: redis + name: redis +spec: + ports: + - name: "6379" + port: 6379 + targetPort: 6379 + selector: + io.kompose.service: redis diff --git a/utils/helm/cluster/templates/work1-1-deployment.yaml b/utils/helm/cluster/templates/work1-1-deployment.yaml deleted file mode 100644 index aced2d0..0000000 --- a/utils/helm/cluster/templates/work1-1-deployment.yaml +++ /dev/null @@ -1,92 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - annotations: - kompose.cmd: kompose convert -f docker-compose-citus.yml -c -o patroni-compose - kompose.version: 1.33.0 (3ce457399) - labels: - io.kompose.service: work1-1 - name: work1-1 -spec: - replicas: 1 - selector: - matchLabels: - io.kompose.service: work1-1 - template: - metadata: - annotations: - kompose.cmd: kompose convert -f docker-compose-citus.yml -c -o patroni-compose - kompose.version: 1.33.0 (3ce457399) - labels: - io.kompose.network/patroni-demo: "true" - io.kompose.service: work1-1 - spec: - containers: - - env: - - name: ETCDCTL_ENDPOINTS - value: http://etcd1:2379,http://etcd2:2379,http://etcd3:2379 - - name: PATRONI_CITUS_DATABASE - value: citus - - name: PATRONI_CITUS_GROUP - value: "1" - - name: PATRONI_ETCD3_HOSTS - value: '''etcd1:2379'',''etcd2:2379'',''etcd3:2379''' - - name: PATRONI_NAME - value: work1-1 - - name: PATRONI_REPLICATION_PASSWORD - valueFrom: - configMapKeyRef: - key: PATRONI_REPLICATION_PASSWORD - name: patroni-env - - name: PATRONI_REPLICATION_USERNAME - valueFrom: - configMapKeyRef: - key: PATRONI_REPLICATION_USERNAME - name: patroni-env - - name: PATRONI_RESTAPI_PASSWORD - valueFrom: - configMapKeyRef: - key: PATRONI_RESTAPI_PASSWORD - name: patroni-env - - name: PATRONI_RESTAPI_USERNAME - valueFrom: - configMapKeyRef: - key: PATRONI_RESTAPI_USERNAME - name: patroni-env - - name: PATRONI_SCOPE - value: demo - - name: PATRONI_SUPERUSER_PASSWORD - valueFrom: - configMapKeyRef: - key: PATRONI_SUPERUSER_PASSWORD - name: patroni-env - - name: PATRONI_SUPERUSER_USERNAME - valueFrom: - configMapKeyRef: - key: PATRONI_SUPERUSER_USERNAME - name: patroni-env - - name: PATRONI_admin_OPTIONS - valueFrom: - configMapKeyRef: - key: PATRONI_admin_OPTIONS - name: patroni-env - - name: PATRONI_admin_PASSWORD - valueFrom: - configMapKeyRef: - key: PATRONI_admin_PASSWORD - name: patroni-env - - name: PGSSLCERT - value: /etc/ssl/certs/ssl-cert-snakeoil.pem - - name: PGSSLKEY - value: /etc/ssl/private/ssl-cert-snakeoil.key - - name: PGSSLMODE - value: verify-ca - - name: PGSSLROOTCERT - value: /etc/ssl/certs/ssl-cert-snakeoil.pem - image: harbor.io.optimcloud.com/optimcloud/patroni-citus:latest - name: demo-work1-1 - ports: - - containerPort: 5432 - protocol: TCP - hostname: work1-1 - restartPolicy: Always diff --git a/utils/helm/cluster/templates/work1-1-service.yaml b/utils/helm/cluster/templates/work1-1-service.yaml deleted file mode 100644 index cb22070..0000000 --- a/utils/helm/cluster/templates/work1-1-service.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - annotations: - kompose.cmd: kompose convert -f docker-compose-citus.yml -c -o patroni-compose - kompose.version: 1.33.0 (3ce457399) - labels: - io.kompose.service: work1-1 - name: work1-1 -spec: - ports: - - name: "5432" - port: 5432 - targetPort: 5432 - selector: - io.kompose.service: work1-1 diff --git a/utils/helm/cluster/templates/work1-2-deployment.yaml b/utils/helm/cluster/templates/work1-2-deployment.yaml deleted file mode 100644 index 84e1b38..0000000 --- a/utils/helm/cluster/templates/work1-2-deployment.yaml +++ /dev/null @@ -1,92 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - annotations: - kompose.cmd: kompose convert -f docker-compose-citus.yml -c -o patroni-compose - kompose.version: 1.33.0 (3ce457399) - labels: - io.kompose.service: work1-2 - name: work1-2 -spec: - replicas: 1 - selector: - matchLabels: - io.kompose.service: work1-2 - template: - metadata: - annotations: - kompose.cmd: kompose convert -f docker-compose-citus.yml -c -o patroni-compose - kompose.version: 1.33.0 (3ce457399) - labels: - io.kompose.network/patroni-demo: "true" - io.kompose.service: work1-2 - spec: - containers: - - env: - - name: ETCDCTL_ENDPOINTS - value: http://etcd1:2379,http://etcd2:2379,http://etcd3:2379 - - name: PATRONI_CITUS_DATABASE - value: citus - - name: PATRONI_CITUS_GROUP - value: "1" - - name: PATRONI_ETCD3_HOSTS - value: '''etcd1:2379'',''etcd2:2379'',''etcd3:2379''' - - name: PATRONI_NAME - value: work1-2 - - name: PATRONI_REPLICATION_PASSWORD - valueFrom: - configMapKeyRef: - key: PATRONI_REPLICATION_PASSWORD - name: patroni-env - - name: PATRONI_REPLICATION_USERNAME - valueFrom: - configMapKeyRef: - key: PATRONI_REPLICATION_USERNAME - name: patroni-env - - name: PATRONI_RESTAPI_PASSWORD - valueFrom: - configMapKeyRef: - key: PATRONI_RESTAPI_PASSWORD - name: patroni-env - - name: PATRONI_RESTAPI_USERNAME - valueFrom: - configMapKeyRef: - key: PATRONI_RESTAPI_USERNAME - name: patroni-env - - name: PATRONI_SCOPE - value: demo - - name: PATRONI_SUPERUSER_PASSWORD - valueFrom: - configMapKeyRef: - key: PATRONI_SUPERUSER_PASSWORD - name: patroni-env - - name: PATRONI_SUPERUSER_USERNAME - valueFrom: - configMapKeyRef: - key: PATRONI_SUPERUSER_USERNAME - name: patroni-env - - name: PATRONI_admin_OPTIONS - valueFrom: - configMapKeyRef: - key: PATRONI_admin_OPTIONS - name: patroni-env - - name: PATRONI_admin_PASSWORD - valueFrom: - configMapKeyRef: - key: PATRONI_admin_PASSWORD - name: patroni-env - - name: PGSSLCERT - value: /etc/ssl/certs/ssl-cert-snakeoil.pem - - name: PGSSLKEY - value: /etc/ssl/private/ssl-cert-snakeoil.key - - name: PGSSLMODE - value: verify-ca - - name: PGSSLROOTCERT - value: /etc/ssl/certs/ssl-cert-snakeoil.pem - image: harbor.io.optimcloud.com/optimcloud/patroni-citus:latest - name: demo-work1-2 - ports: - - containerPort: 5432 - protocol: TCP - hostname: work1-2 - restartPolicy: Always diff --git a/utils/helm/cluster/templates/work1-2-service.yaml b/utils/helm/cluster/templates/work1-2-service.yaml deleted file mode 100644 index 47ca18c..0000000 --- a/utils/helm/cluster/templates/work1-2-service.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - annotations: - kompose.cmd: kompose convert -f docker-compose-citus.yml -c -o patroni-compose - kompose.version: 1.33.0 (3ce457399) - labels: - io.kompose.service: work1-2 - name: work1-2 -spec: - ports: - - name: "5432" - port: 5432 - targetPort: 5432 - selector: - io.kompose.service: work1-2 diff --git a/utils/helm/cluster/templates/work2-1-deployment.yaml b/utils/helm/cluster/templates/work2-1-deployment.yaml deleted file mode 100644 index f54312e..0000000 --- a/utils/helm/cluster/templates/work2-1-deployment.yaml +++ /dev/null @@ -1,92 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - annotations: - kompose.cmd: kompose convert -f docker-compose-citus.yml -c -o patroni-compose - kompose.version: 1.33.0 (3ce457399) - labels: - io.kompose.service: work2-1 - name: work2-1 -spec: - replicas: 1 - selector: - matchLabels: - io.kompose.service: work2-1 - template: - metadata: - annotations: - kompose.cmd: kompose convert -f docker-compose-citus.yml -c -o patroni-compose - kompose.version: 1.33.0 (3ce457399) - labels: - io.kompose.network/patroni-demo: "true" - io.kompose.service: work2-1 - spec: - containers: - - env: - - name: ETCDCTL_ENDPOINTS - value: http://etcd1:2379,http://etcd2:2379,http://etcd3:2379 - - name: PATRONI_CITUS_DATABASE - value: citus - - name: PATRONI_CITUS_GROUP - value: "2" - - name: PATRONI_ETCD3_HOSTS - value: '''etcd1:2379'',''etcd2:2379'',''etcd3:2379''' - - name: PATRONI_NAME - value: work2-1 - - name: PATRONI_REPLICATION_PASSWORD - valueFrom: - configMapKeyRef: - key: PATRONI_REPLICATION_PASSWORD - name: patroni-env - - name: PATRONI_REPLICATION_USERNAME - valueFrom: - configMapKeyRef: - key: PATRONI_REPLICATION_USERNAME - name: patroni-env - - name: PATRONI_RESTAPI_PASSWORD - valueFrom: - configMapKeyRef: - key: PATRONI_RESTAPI_PASSWORD - name: patroni-env - - name: PATRONI_RESTAPI_USERNAME - valueFrom: - configMapKeyRef: - key: PATRONI_RESTAPI_USERNAME - name: patroni-env - - name: PATRONI_SCOPE - value: demo - - name: PATRONI_SUPERUSER_PASSWORD - valueFrom: - configMapKeyRef: - key: PATRONI_SUPERUSER_PASSWORD - name: patroni-env - - name: PATRONI_SUPERUSER_USERNAME - valueFrom: - configMapKeyRef: - key: PATRONI_SUPERUSER_USERNAME - name: patroni-env - - name: PATRONI_admin_OPTIONS - valueFrom: - configMapKeyRef: - key: PATRONI_admin_OPTIONS - name: patroni-env - - name: PATRONI_admin_PASSWORD - valueFrom: - configMapKeyRef: - key: PATRONI_admin_PASSWORD - name: patroni-env - - name: PGSSLCERT - value: /etc/ssl/certs/ssl-cert-snakeoil.pem - - name: PGSSLKEY - value: /etc/ssl/private/ssl-cert-snakeoil.key - - name: PGSSLMODE - value: verify-ca - - name: PGSSLROOTCERT - value: /etc/ssl/certs/ssl-cert-snakeoil.pem - image: harbor.io.optimcloud.com/optimcloud/patroni-citus:latest - name: demo-work2-1 - ports: - - containerPort: 5432 - protocol: TCP - hostname: work2-1 - restartPolicy: Always diff --git a/utils/helm/cluster/templates/work2-1-service.yaml b/utils/helm/cluster/templates/work2-1-service.yaml deleted file mode 100644 index 0ae0d05..0000000 --- a/utils/helm/cluster/templates/work2-1-service.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - annotations: - kompose.cmd: kompose convert -f docker-compose-citus.yml -c -o patroni-compose - kompose.version: 1.33.0 (3ce457399) - labels: - io.kompose.service: work2-1 - name: work2-1 -spec: - ports: - - name: "5432" - port: 5432 - targetPort: 5432 - selector: - io.kompose.service: work2-1 diff --git a/utils/helm/cluster/templates/work2-2-deployment.yaml b/utils/helm/cluster/templates/work2-2-deployment.yaml deleted file mode 100644 index 26e2545..0000000 --- a/utils/helm/cluster/templates/work2-2-deployment.yaml +++ /dev/null @@ -1,92 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - annotations: - kompose.cmd: kompose convert -f docker-compose-citus.yml -c -o patroni-compose - kompose.version: 1.33.0 (3ce457399) - labels: - io.kompose.service: work2-2 - name: work2-2 -spec: - replicas: 1 - selector: - matchLabels: - io.kompose.service: work2-2 - template: - metadata: - annotations: - kompose.cmd: kompose convert -f docker-compose-citus.yml -c -o patroni-compose - kompose.version: 1.33.0 (3ce457399) - labels: - io.kompose.network/patroni-demo: "true" - io.kompose.service: work2-2 - spec: - containers: - - env: - - name: ETCDCTL_ENDPOINTS - value: http://etcd1:2379,http://etcd2:2379,http://etcd3:2379 - - name: PATRONI_CITUS_DATABASE - value: citus - - name: PATRONI_CITUS_GROUP - value: "2" - - name: PATRONI_ETCD3_HOSTS - value: '''etcd1:2379'',''etcd2:2379'',''etcd3:2379''' - - name: PATRONI_NAME - value: work2-2 - - name: PATRONI_REPLICATION_PASSWORD - valueFrom: - configMapKeyRef: - key: PATRONI_REPLICATION_PASSWORD - name: patroni-env - - name: PATRONI_REPLICATION_USERNAME - valueFrom: - configMapKeyRef: - key: PATRONI_REPLICATION_USERNAME - name: patroni-env - - name: PATRONI_RESTAPI_PASSWORD - valueFrom: - configMapKeyRef: - key: PATRONI_RESTAPI_PASSWORD - name: patroni-env - - name: PATRONI_RESTAPI_USERNAME - valueFrom: - configMapKeyRef: - key: PATRONI_RESTAPI_USERNAME - name: patroni-env - - name: PATRONI_SCOPE - value: demo - - name: PATRONI_SUPERUSER_PASSWORD - valueFrom: - configMapKeyRef: - key: PATRONI_SUPERUSER_PASSWORD - name: patroni-env - - name: PATRONI_SUPERUSER_USERNAME - valueFrom: - configMapKeyRef: - key: PATRONI_SUPERUSER_USERNAME - name: patroni-env - - name: PATRONI_admin_OPTIONS - valueFrom: - configMapKeyRef: - key: PATRONI_admin_OPTIONS - name: patroni-env - - name: PATRONI_admin_PASSWORD - valueFrom: - configMapKeyRef: - key: PATRONI_admin_PASSWORD - name: patroni-env - - name: PGSSLCERT - value: /etc/ssl/certs/ssl-cert-snakeoil.pem - - name: PGSSLKEY - value: /etc/ssl/private/ssl-cert-snakeoil.key - - name: PGSSLMODE - value: verify-ca - - name: PGSSLROOTCERT - value: /etc/ssl/certs/ssl-cert-snakeoil.pem - image: harbor.io.optimcloud.com/optimcloud/patroni-citus:latest - name: demo-work2-2 - ports: - - containerPort: 5432 - protocol: TCP - hostname: work2-2 - restartPolicy: Always diff --git a/utils/helm/cluster/templates/work2-2-service.yaml b/utils/helm/cluster/templates/work2-2-service.yaml deleted file mode 100644 index 83996ec..0000000 --- a/utils/helm/cluster/templates/work2-2-service.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - annotations: - kompose.cmd: kompose convert -f docker-compose-citus.yml -c -o patroni-compose - kompose.version: 1.33.0 (3ce457399) - labels: - io.kompose.service: work2-2 - name: work2-2 -spec: - ports: - - name: "5432" - port: 5432 - targetPort: 5432 - selector: - io.kompose.service: work2-2