Skip to content

Commit a80415b

Browse files
nicktrnnicktrn
committed
postgresql -> postgres
1 parent eb2c8ae commit a80415b

File tree

9 files changed

+66
-66
lines changed

9 files changed

+66
-66
lines changed

‎hosting/k8s/helm/README.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ Use external managed services instead of bundled components:
119119
120120
```yaml
121121
# External PostgreSQL
122-
postgresql:
122+
postgres:
123123
enabled: false
124124
external: true
125125
externalConnection:
@@ -180,7 +180,7 @@ resources:
180180
cpu: 1000m
181181
memory: 2Gi
182182

183-
postgresql:
183+
postgres:
184184
primary:
185185
resources:
186186
limits:
@@ -212,7 +212,7 @@ All services support persistent storage and allow you to control the storage cla
212212
global:
213213
storageClass: "fast-ssd" # Default for all services
214214

215-
postgresql:
215+
postgres:
216216
primary:
217217
persistence:
218218
enabled: true
@@ -331,7 +331,7 @@ kubectl get pods -l app.kubernetes.io/name=trigger.dev
331331
kubectl logs -l app.kubernetes.io/component=webapp
332332
333333
# Database logs
334-
kubectl logs -l app.kubernetes.io/component=postgresql
334+
kubectl logs -l app.kubernetes.io/component=postgres
335335
```
336336

337337
### Run Tests
@@ -459,7 +459,7 @@ helm upgrade --install trigger . \
459459
cpu: 1000m
460460
memory: 2Gi
461461
462-
postgresql:
462+
postgres:
463463
primary:
464464
resources:
465465
limits:
@@ -503,7 +503,7 @@ helm upgrade --install trigger . \
503503
global:
504504
storageClass: "fast-nvme" # Default for all services
505505
506-
postgresql:
506+
postgres:
507507
persistence:
508508
primary:
509509
size: 500Gi

‎hosting/k8s/helm/templates/NOTES.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ Bootstrap Mode is enabled:
5858
{{- end }}
5959

6060
Configuration:
61-
{{- if .Values.postgresql.external }}
62-
- Using external PostgreSQL at {{ .Values.postgresql.externalConnection.host }}:{{ .Values.postgresql.externalConnection.port }}
61+
{{- if .Values.postgres.external }}
62+
- Using external PostgreSQL at {{ .Values.postgres.externalConnection.host }}:{{ .Values.postgres.externalConnection.port }}
6363
{{- else }}
6464
- Using internal PostgreSQL
6565
{{- end }}

‎hosting/k8s/helm/templates/_helpers.tpl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,11 @@ Get the full image name for supervisor
9898
{{/*
9999
PostgreSQL connection string for internal PostgreSQL
100100
*/}}
101-
{{- define "trigger-v4.postgresql.connectionString" -}}
102-
{{- if .Values.postgresql.external -}}
103-
postgresql://{{ .Values.postgresql.externalConnection.username }}:{{ .Values.postgresql.externalConnection.password }}@{{ .Values.postgresql.externalConnection.host }}:{{ .Values.postgresql.externalConnection.port }}/{{ .Values.postgresql.externalConnection.database }}?schema=public&sslmode=disable
101+
{{- define "trigger-v4.postgres.connectionString" -}}
102+
{{- if .Values.postgres.external -}}
103+
postgresql://{{ .Values.postgres.externalConnection.username }}:{{ .Values.postgres.externalConnection.password }}@{{ .Values.postgres.externalConnection.host }}:{{ .Values.postgres.externalConnection.port }}/{{ .Values.postgres.externalConnection.database }}?schema=public&sslmode=disable
104104
{{- else -}}
105-
postgresql://{{ .Values.postgresql.auth.username }}:{{ .Values.postgresql.auth.password }}@{{ include "trigger-v4.fullname" . }}-postgresql:{{ .Values.postgresql.primary.service.ports.postgresql }}/{{ .Values.postgresql.auth.database }}?schema=public&sslmode=disable
105+
postgresql://{{ .Values.postgres.auth.username }}:{{ .Values.postgres.auth.password }}@{{ include "trigger-v4.fullname" . }}-postgres:{{ .Values.postgres.primary.service.ports.postgres }}/{{ .Values.postgres.auth.database }}?schema=public&sslmode=disable
106106
{{- end -}}
107107
{{- end }}
108108

‎hosting/k8s/helm/templates/electric.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ spec:
3838
protocol: TCP
3939
env:
4040
- name: DATABASE_URL
41-
value: {{ include "trigger-v4.postgresql.connectionString" . | quote }}
41+
value: {{ include "trigger-v4.postgres.connectionString" . | quote }}
4242
- name: ELECTRIC_INSECURE
4343
value: {{ .Values.electric.config.insecure | quote }}
4444
- name: ELECTRIC_USAGE_REPORTING

‎hosting/k8s/helm/templates/postgresql.yaml‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,64 @@
1-
{{- if and .Values.postgresql.enabled (not .Values.postgresql.external) }}
1+
{{- if and .Values.postgres.enabled (not .Values.postgres.external) }}
22
apiVersion: apps/v1
33
kind: StatefulSet
44
metadata:
5-
name: {{ include "trigger-v4.fullname" . }}-postgresql
5+
name: {{ include "trigger-v4.fullname" . }}-postgres
66
labels:
7-
{{- $component := "postgresql" }}
7+
{{- $component := "postgres" }}
88
{{- include "trigger-v4.componentLabels" (dict "Chart" .Chart "Release" .Release "Values" .Values "component" $component) | nindent 4 }}
99
spec:
1010
replicas: 1
11-
serviceName: {{ include "trigger-v4.fullname" . }}-postgresql-headless
11+
serviceName: {{ include "trigger-v4.fullname" . }}-postgres-headless
1212
selector:
1313
matchLabels:
1414
{{- include "trigger-v4.componentSelectorLabels" (dict "Chart" .Chart "Release" .Release "Values" .Values "component" $component) | nindent 6 }}
1515
template:
1616
metadata:
17-
{{- with .Values.postgresql.podAnnotations }}
17+
{{- with .Values.postgres.podAnnotations }}
1818
annotations:
1919
{{- toYaml . | nindent 8 }}
2020
{{- end }}
2121
labels:
2222
{{- include "trigger-v4.componentSelectorLabels" (dict "Chart" .Chart "Release" .Release "Values" .Values "component" $component) | nindent 8 }}
2323
spec:
24-
{{- with .Values.postgresql.podSecurityContext }}
24+
{{- with .Values.postgres.podSecurityContext }}
2525
securityContext:
2626
{{- toYaml . | nindent 8 }}
2727
{{- end }}
2828
containers:
29-
- name: postgresql
30-
{{- with .Values.postgresql.securityContext }}
29+
- name: postgres
30+
{{- with .Values.postgres.securityContext }}
3131
securityContext:
3232
{{- toYaml . | nindent 12 }}
3333
{{- end }}
34-
image: "{{ .Values.postgresql.image.registry }}/{{ .Values.postgresql.image.repository }}:{{ .Values.postgresql.image.tag }}"
35-
imagePullPolicy: {{ .Values.postgresql.image.pullPolicy }}
34+
image: "{{ .Values.postgres.image.registry }}/{{ .Values.postgres.image.repository }}:{{ .Values.postgres.image.tag }}"
35+
imagePullPolicy: {{ .Values.postgres.image.pullPolicy }}
3636
ports:
37-
- name: postgresql
38-
containerPort: {{ .Values.postgresql.primary.service.ports.postgresql }}
37+
- name: postgres
38+
containerPort: {{ .Values.postgres.primary.service.ports.postgres }}
3939
protocol: TCP
4040
env:
4141
- name: POSTGRES_USER
42-
value: {{ .Values.postgresql.auth.username | quote }}
42+
value: {{ .Values.postgres.auth.username | quote }}
4343
- name: POSTGRES_PASSWORD
44-
value: {{ .Values.postgresql.auth.password | quote }}
44+
value: {{ .Values.postgres.auth.password | quote }}
4545
- name: POSTGRES_DB
46-
value: {{ .Values.postgresql.auth.database | quote }}
47-
{{- with .Values.postgresql.extraEnv }}
46+
value: {{ .Values.postgres.auth.database | quote }}
47+
{{- with .Values.postgres.extraEnv }}
4848
{{- toYaml . | nindent 12 }}
4949
{{- end }}
5050
args:
5151
- "-c"
5252
- "wal_level=logical"
53-
{{- with .Values.postgresql.extraArgs }}
53+
{{- with .Values.postgres.extraArgs }}
5454
{{- toYaml . | nindent 12 }}
5555
{{- end }}
5656
livenessProbe:
5757
exec:
5858
command:
5959
- pg_isready
6060
- -U
61-
- {{ .Values.postgresql.auth.username }}
61+
- {{ .Values.postgres.auth.username }}
6262
initialDelaySeconds: 10
6363
periodSeconds: 10
6464
timeoutSeconds: 5
@@ -68,52 +68,52 @@ spec:
6868
command:
6969
- pg_isready
7070
- -U
71-
- {{ .Values.postgresql.auth.username }}
71+
- {{ .Values.postgres.auth.username }}
7272
initialDelaySeconds: 10
7373
periodSeconds: 10
7474
timeoutSeconds: 5
7575
failureThreshold: 5
7676
resources:
77-
{{- toYaml .Values.postgresql.primary.resources | nindent 12 }}
77+
{{- toYaml .Values.postgres.primary.resources | nindent 12 }}
7878
volumeMounts:
79-
- name: postgresql-data
79+
- name: postgres-data
8080
mountPath: /var/lib/postgresql/data
81-
{{- if .Values.postgresql.primary.persistence.enabled }}
81+
{{- if .Values.postgres.primary.persistence.enabled }}
8282
volumeClaimTemplates:
8383
- metadata:
84-
name: postgresql-data
84+
name: postgres-data
8585
labels:
86-
{{- $component := "postgresql" }}
86+
{{- $component := "postgres" }}
8787
{{- include "trigger-v4.componentLabels" (dict "Chart" .Chart "Release" .Release "Values" .Values "component" $component) | nindent 10 }}
8888
spec:
8989
accessModes:
9090
- ReadWriteOnce
9191
resources:
9292
requests:
93-
storage: {{ .Values.postgresql.primary.persistence.size }}
94-
{{- $storageClass := .Values.postgresql.primary.persistence.storageClass | default .Values.global.storageClass }}
93+
storage: {{ .Values.postgres.primary.persistence.size }}
94+
{{- $storageClass := .Values.postgres.primary.persistence.storageClass | default .Values.global.storageClass }}
9595
{{- if $storageClass }}
9696
storageClassName: {{ $storageClass | quote }}
9797
{{- end }}
9898
{{- else }}
9999
volumes:
100-
- name: postgresql-data
100+
- name: postgres-data
101101
emptyDir: {}
102102
{{- end }}
103-
{{- if .Values.postgresql.primary.persistence.enabled }}
103+
{{- if .Values.postgres.primary.persistence.enabled }}
104104
volumeClaimTemplates:
105105
- metadata:
106-
name: postgresql-data
106+
name: postgres-data
107107
labels:
108-
{{- $component := "postgresql" }}
108+
{{- $component := "postgres" }}
109109
{{- include "trigger-v4.componentLabels" (dict "Chart" .Chart "Release" .Release "Values" .Values "component" $component) | nindent 10 }}
110110
spec:
111111
accessModes:
112112
- ReadWriteOnce
113113
resources:
114114
requests:
115-
storage: {{ .Values.postgresql.primary.persistence.size }}
116-
{{- $storageClass := .Values.postgresql.primary.persistence.storageClass | default .Values.global.storageClass }}
115+
storage: {{ .Values.postgres.primary.persistence.size }}
116+
{{- $storageClass := .Values.postgres.primary.persistence.storageClass | default .Values.global.storageClass }}
117117
{{- if $storageClass }}
118118
storageClassName: {{ $storageClass | quote }}
119119
{{- end }}
@@ -122,34 +122,34 @@ spec:
122122
apiVersion: v1
123123
kind: Service
124124
metadata:
125-
name: {{ include "trigger-v4.fullname" . }}-postgresql-headless
125+
name: {{ include "trigger-v4.fullname" . }}-postgres-headless
126126
labels:
127-
{{- $component := "postgresql" }}
127+
{{- $component := "postgres" }}
128128
{{- include "trigger-v4.componentLabels" (dict "Chart" .Chart "Release" .Release "Values" .Values "component" $component) | nindent 4 }}
129129
spec:
130130
type: ClusterIP
131131
clusterIP: None
132132
ports:
133-
- name: postgresql
134-
port: {{ .Values.postgresql.primary.service.ports.postgresql }}
135-
targetPort: postgresql
133+
- name: postgres
134+
port: {{ .Values.postgres.primary.service.ports.postgres }}
135+
targetPort: postgres
136136
protocol: TCP
137137
selector:
138138
{{- include "trigger-v4.componentSelectorLabels" (dict "Chart" .Chart "Release" .Release "Values" .Values "component" $component) | nindent 4 }}
139139
---
140140
apiVersion: v1
141141
kind: Service
142142
metadata:
143-
name: {{ include "trigger-v4.fullname" . }}-postgresql
143+
name: {{ include "trigger-v4.fullname" . }}-postgres
144144
labels:
145-
{{- $component := "postgresql" }}
145+
{{- $component := "postgres" }}
146146
{{- include "trigger-v4.componentLabels" (dict "Chart" .Chart "Release" .Release "Values" .Values "component" $component) | nindent 4 }}
147147
spec:
148148
type: ClusterIP
149149
ports:
150-
- name: postgresql
151-
port: {{ .Values.postgresql.primary.service.ports.postgresql }}
152-
targetPort: postgresql
150+
- name: postgres
151+
port: {{ .Values.postgres.primary.service.ports.postgres }}
152+
targetPort: postgres
153153
protocol: TCP
154154
selector:
155155
{{- include "trigger-v4.componentSelectorLabels" (dict "Chart" .Chart "Release" .Release "Values" .Values "component" $component) | nindent 4 }}

‎hosting/k8s/helm/templates/tests/test-postgresql.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
{{- if and .Values.postgresql.enabled (not .Values.postgresql.external) }}
1+
{{- if and .Values.postgres.enabled (not .Values.postgres.external) }}
22
apiVersion: v1
33
kind: Pod
44
metadata:
5-
name: "{{ include "trigger-v4.fullname" . }}-test-postgresql"
5+
name: "{{ include "trigger-v4.fullname" . }}-test-postgres"
66
labels:
77
{{- include "trigger-v4.labels" . | nindent 4 }}
88
annotations:
99
"helm.sh/hook": test
1010
spec:
1111
restartPolicy: Never
1212
containers:
13-
- name: test-postgresql
14-
image: postgres:{{ .Values.postgresql.image.tag }}
13+
- name: test-postgres
14+
image: postgres:{{ .Values.postgres.image.tag }}
1515
command: ['sh', '-c']
1616
args:
1717
- |
1818
echo "Testing PostgreSQL connection..."
19-
pg_isready -h {{ include "trigger-v4.fullname" . }}-postgresql -p {{ .Values.postgresql.primary.service.ports.postgresql }} -U {{ .Values.postgresql.auth.username }}
19+
pg_isready -h {{ include "trigger-v4.fullname" . }}-postgres -p {{ .Values.postgres.primary.service.ports.postgres }} -U {{ .Values.postgres.auth.username }}
2020
echo "PostgreSQL test completed successfully"
2121
{{- end }}

‎hosting/k8s/helm/templates/webapp.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,9 @@ spec:
7474
- name: ELECTRIC_ORIGIN
7575
value: {{ include "trigger-v4.electric.url" . | quote }}
7676
- name: DATABASE_URL
77-
value: {{ include "trigger-v4.postgresql.connectionString" . | quote }}
77+
value: {{ include "trigger-v4.postgres.connectionString" . | quote }}
7878
- name: DIRECT_URL
79-
value: {{ include "trigger-v4.postgresql.connectionString" . | quote }}
79+
value: {{ include "trigger-v4.postgres.connectionString" . | quote }}
8080
- name: REDIS_HOST
8181
value: {{ include "trigger-v4.redis.host" . | quote }}
8282
- name: REDIS_PORT

‎hosting/k8s/helm/values-production-example.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ webapp:
4848
memory: 2Gi
4949

5050
# Production PostgreSQL (or use external)
51-
postgresql:
51+
postgres:
5252
primary:
5353
persistence:
5454
enabled: true
@@ -121,7 +121,7 @@ supervisor:
121121
cpu: 250m
122122
memory: 512Mi
123123
# Example: Use external PostgreSQL instead
124-
# postgresql:
124+
# postgres:
125125
# enabled: false
126126
# external: true
127127
# externalConnection:

‎hosting/k8s/helm/values.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ secrets:
151151
secretAccessKey: "very-safe-password"
152152

153153
# PostgreSQL configuration
154-
postgresql:
154+
postgres:
155155
enabled: true
156156
external: false
157157
image:
@@ -180,7 +180,7 @@ postgresql:
180180
size: 10Gi
181181
service:
182182
ports:
183-
postgresql: 5432
183+
postgres: 5432
184184
resources: {}
185185
configuration: |
186186
wal_level = logical

0 commit comments

Comments
 (0)