Skip to content

Commit 297e430

Browse files
authored
migrate postgres to non-bitnami image for quickstart (#365)
Signed-off-by: Dejan Zele Pejchev <pejcev.dejan@gmail.com>
1 parent 26571b1 commit 297e430

File tree

3 files changed

+61
-34
lines changed

3 files changed

+61
-34
lines changed

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ uninstall-ingress-controller: ## Uninstall ingress controller.
310310
.PHONY: helm-repos
311311
helm-repos: ## Add helm repos for external dependencies.
312312
helm repo add jetstack https://charts.jetstack.io
313-
helm repo add bitnami https://charts.bitnami.com/bitnami
313+
helm repo add groundhog2k https://groundhog2k.github.io/helm-charts/
314314
helm repo add apache https://pulsar.apache.org/charts
315315
helm repo add dandydev https://dandydeveloper.github.io/charts
316316
helm repo add gresearch https://g-research.github.io/charts
@@ -336,15 +336,15 @@ helm-uninstall-pulsar: ## Uninstall Apache Pulsar using Helm.
336336

337337
.PHONY: helm-install-postgres
338338
helm-install-postgres: helm-repos ## Install PostgreSQL using Helm.
339-
helm upgrade --install postgresql bitnami/postgresql --version 16.7.5 --values dev/quickstart/postgres.values.yaml --create-namespace --namespace data
339+
helm upgrade --install postgresql groundhog2k/postgres --version 1.5.8 --values dev/quickstart/postgres.values.yaml --create-namespace --namespace data
340340

341341
.PHONY: helm-uninstall-postgres
342342
helm-uninstall-postgres: ## Uninstall PostgreSQL using Helm.
343343
helm uninstall postgresql --namespace data
344344

345345
.PHONY: helm-install-redis
346346
helm-install-redis: helm-repos ## Install Redis using Helm.
347-
helm upgrade --install redis-ha dandydev/redis-ha --version 4.33.7 --values dev/quickstart/redis.values.yaml --create-namespace --namespace data
347+
helm upgrade --install redis-ha dandydev/redis-ha --version 4.34.13 --values dev/quickstart/redis.values.yaml --create-namespace --namespace data
348348

349349
.PHONY: helm-uninstall-redis
350350
helm-uninstall-redis: ## Uninstall Redis using Helm.
Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,9 @@
1-
auth:
2-
postgresPassword: psw
1+
settings:
2+
superuserPassword:
3+
value: "psw"
4+
5+
customScripts:
6+
init-databases.sql: |
7+
-- Create databases for Armada components
8+
CREATE DATABASE scheduler;
9+
CREATE DATABASE lookout;

dev/quickstart/pulsar.values.yaml

Lines changed: 49 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,31 @@
1-
kube-prometheus-stack:
2-
enabled: false
3-
prometheus:
4-
enabled: false
5-
grafana:
6-
enabled: false
7-
prometheus-node-exporter:
8-
enabled: false
9-
alertmanager:
10-
enabled: false
11-
12-
13-
# minimal pulsar broker config inspired by
14-
# https://github.com/apache/pulsar-helm-chart/blob/master/examples/values-minikube.yaml
15-
16-
# deployed withh emptyDir
171
volumes:
182
persistence: false
193

20-
# disabled AntiAffinity
214
affinity:
225
anti_affinity: false
236

24-
# disable auto recovery
7+
monitoring:
8+
prometheus: false
9+
2510
components:
11+
zookeeper: true
12+
bookkeeper: true
13+
broker: true
14+
proxy: true
2615
autorecovery: false
16+
functions: false
17+
toolset: true
2718
pulsar_manager: true
2819

29-
broker:
30-
replicaCount: 1
31-
configData:
32-
## Enable `autoSkipNonRecoverableData` since bookkeeper is running
33-
## without persistence
34-
autoSkipNonRecoverableData: "true"
35-
# storage settings
36-
managedLedgerDefaultEnsembleSize: "1"
37-
managedLedgerDefaultWriteQuorum: "1"
38-
managedLedgerDefaultAckQuorum: "1"
39-
4020
zookeeper:
4121
replicaCount: 1
22+
podMonitor:
23+
enabled: false
4224

4325
bookkeeper:
4426
replicaCount: 1
27+
podMonitor:
28+
enabled: false
4529
configData:
4630
# minimal memory use for bookkeeper
4731
# https://bookkeeper.apache.org/docs/reference/config#db-ledger-storage-settings
@@ -52,5 +36,41 @@ bookkeeper:
5236
# make bookie work with large disks having little percentage disk space left
5337
diskUsageThreshold: "0.999"
5438

39+
broker:
40+
replicaCount: 1
41+
podMonitor:
42+
enabled: false
43+
configData:
44+
## Enable `autoSkipNonRecoverableData` since bookkeeper is running
45+
## without persistence
46+
autoSkipNonRecoverableData: "true"
47+
# storage settings
48+
managedLedgerDefaultEnsembleSize: "1"
49+
managedLedgerDefaultWriteQuorum: "1"
50+
managedLedgerDefaultAckQuorum: "1"
51+
5552
proxy:
5653
replicaCount: 1
54+
podMonitor:
55+
enabled: false
56+
57+
autorecovery:
58+
podMonitor:
59+
enabled: false
60+
61+
victoria-metrics-k8s-stack:
62+
enabled: false
63+
victoria-metrics-operator:
64+
enabled: false
65+
crds:
66+
plain: false
67+
vmsingle:
68+
enabled: false
69+
vmagent:
70+
enabled: false
71+
vmalert:
72+
enabled: false
73+
alertmanager:
74+
enabled: false
75+
grafana:
76+
enabled: false

0 commit comments

Comments
 (0)