Skip to content

Commit a5d5e02

Browse files
drpsyko101drpsyko101
committed
Add support for custom secretRef keys
1 parent 54b0c2d commit a5d5e02

19 files changed

+132
-51
lines changed

‎charts/supabase/templates/analytics/deployment.yaml

+9-5
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,11 @@ spec:
4444
secretKeyRef:
4545
{{- if .Values.secret.db.secretRef }}
4646
name: {{ .Values.secret.db.secretRef }}
47+
key: {{ .Values.secret.db.secretRefKey.username | default "username" }}
4748
{{- else }}
4849
name: {{ include "supabase.secret.db" . }}
49-
{{- end }}
5050
key: username
51+
{{- end }}
5152
- name: DB_PORT
5253
value: {{ .Values.analytics.environment.DB_PORT | quote }}
5354
command: ["/bin/sh", "-c"]
@@ -78,16 +79,17 @@ spec:
7879
secretKeyRef:
7980
{{- if .Values.secret.db.secretRef }}
8081
name: {{ .Values.secret.db.secretRef }}
82+
key: {{ .Values.secret.db.secretRefKey.password | default "password" }}
8183
{{- else }}
8284
name: {{ include "supabase.secret.db" . }}
83-
{{- end }}
8485
key: password
86+
{{- end }}
8587
- name: DB_PASSWORD_ENC
8688
valueFrom:
8789
secretKeyRef:
8890
{{- if .Values.secret.db.secretRef }}
8991
name: {{ .Values.secret.db.secretRef }}
90-
key: password
92+
key: {{ .Values.secret.db.secretRefKey.password | default "password" }}
9193
{{- else }}
9294
name: {{ include "supabase.secret.db" . }}
9395
key: password_encoded
@@ -97,19 +99,21 @@ spec:
9799
secretKeyRef:
98100
{{- if .Values.secret.db.secretRef }}
99101
name: {{ .Values.secret.db.secretRef }}
102+
key: {{ .Values.secret.db.secretRefKey.database | default "database" }}
100103
{{- else }}
101104
name: {{ include "supabase.secret.db" . }}
102-
{{- end }}
103105
key: database
106+
{{- end }}
104107
- name: LOGFLARE_API_KEY
105108
valueFrom:
106109
secretKeyRef:
107110
{{- if .Values.secret.analytics.secretRef }}
108111
name: {{ .Values.secret.analytics.secretRef }}
112+
key: {{ .Values.secret.analytics.secretRefKey.apiKey | default "apiKey" }}
109113
{{- else }}
110114
name: {{ include "supabase.secret.analytics" . }}
111-
{{- end }}
112115
key: apiKey
116+
{{- end }}
113117
{{- if .Values.analytics.bigQuery.enabled }}
114118
- name: GOOGLE_PROJECT_ID
115119
value: {{ .Values.analytics.bigQuery.projectId | quote }}

‎charts/supabase/templates/auth/deployment.yaml

+13-7
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,11 @@ spec:
4444
secretKeyRef:
4545
{{- if .Values.secret.db.secretRef }}
4646
name: {{ .Values.secret.db.secretRef }}
47+
key: {{ .Values.secret.db.secretRefKey.username | default "username" }}
4748
{{- else }}
4849
name: {{ include "supabase.secret.db" . }}
49-
{{- end }}
5050
key: username
51+
{{- end }}
5152
- name: DB_PORT
5253
value: {{ .Values.auth.environment.DB_PORT | quote }}
5354
command: ["/bin/sh", "-c"]
@@ -78,16 +79,17 @@ spec:
7879
secretKeyRef:
7980
{{- if .Values.secret.db.secretRef }}
8081
name: {{ .Values.secret.db.secretRef }}
82+
key: {{ .Values.secret.db.secretRefKey.password | default "password" }}
8183
{{- else }}
8284
name: {{ include "supabase.secret.db" . }}
83-
{{- end }}
8485
key: password
86+
{{- end }}
8587
- name: DB_PASSWORD_ENC
8688
valueFrom:
8789
secretKeyRef:
8890
{{- if .Values.secret.db.secretRef }}
8991
name: {{ .Values.secret.db.secretRef }}
90-
key: password
92+
key: {{ .Values.secret.db.secretRefKey.password | default "password" }}
9193
{{- else }}
9294
name: {{ include "supabase.secret.db" . }}
9395
key: password_encoded
@@ -97,10 +99,11 @@ spec:
9799
secretKeyRef:
98100
{{- if .Values.secret.db.secretRef }}
99101
name: {{ .Values.secret.db.secretRef }}
102+
key: {{ .Values.secret.db.secretRefKey.database | default "database" }}
100103
{{- else }}
101104
name: {{ include "supabase.secret.db" . }}
102-
{{- end }}
103105
key: database
106+
{{- end }}
104107
- name: GOTRUE_DB_DATABASE_URL
105108
value: $(DB_DRIVER)://$(DB_USER):$(DB_PASSWORD_ENC)@$(DB_HOST):$(DB_PORT)/$(DB_NAME)?search_path=auth&sslmode=$(DB_SSL)
106109
- name: GOTRUE_DB_DRIVER
@@ -110,28 +113,31 @@ spec:
110113
secretKeyRef:
111114
{{- if .Values.secret.jwt.secretRef }}
112115
name: {{ .Values.secret.jwt.secretRef }}
116+
key: {{ .Values.secret.jwt.secretRefKey.secret | default "secret" }}
113117
{{- else }}
114118
name: {{ include "supabase.secret.jwt" . }}
115-
{{- end }}
116119
key: secret
120+
{{- end }}
117121
- name: GOTRUE_SMTP_USER
118122
valueFrom:
119123
secretKeyRef:
120124
{{- if .Values.secret.smtp.secretRef }}
121125
name: {{ .Values.secret.smtp.secretRef }}
126+
key: {{ .Values.secret.smtp.secretRefKey.username | default "username" }}
122127
{{- else }}
123128
name: {{ include "supabase.secret.smtp" . }}
124-
{{- end }}
125129
key: username
130+
{{- end }}
126131
- name: GOTRUE_SMTP_PASS
127132
valueFrom:
128133
secretKeyRef:
129134
{{- if .Values.secret.smtp.secretRef }}
130135
name: {{ .Values.secret.smtp.secretRef }}
136+
key: {{ .Values.secret.smtp.secretRefKey.password | default "password" }}
131137
{{- else }}
132138
name: {{ include "supabase.secret.smtp" . }}
133-
{{- end }}
134139
key: password
140+
{{- end }}
135141
{{- with .Values.auth.livenessProbe }}
136142
livenessProbe:
137143
{{- toYaml . | nindent 12 }}

‎charts/supabase/templates/db/deployment.yaml

+10-5
Original file line numberDiff line numberDiff line change
@@ -68,46 +68,51 @@ spec:
6868
secretKeyRef:
6969
{{- if .Values.secret.db.secretRef }}
7070
name: {{ .Values.secret.db.secretRef }}
71+
key: {{ .Values.secret.db.secretRefKey.username | default "username" }}
7172
{{- else }}
7273
name: {{ include "supabase.secret.db" . }}
73-
{{- end }}
7474
key: username
75+
{{- end }}
7576
- name: PGPASSWORD
7677
valueFrom:
7778
secretKeyRef:
7879
{{- if .Values.secret.db.secretRef }}
7980
name: {{ .Values.secret.db.secretRef }}
81+
key: {{ .Values.secret.db.secretRefKey.password | default "password" }}
8082
{{- else }}
8183
name: {{ include "supabase.secret.db" . }}
82-
{{- end }}
8384
key: password
85+
{{- end }}
8486
- name: POSTGRES_PASSWORD
8587
valueFrom:
8688
secretKeyRef:
8789
{{- if .Values.secret.db.secretRef }}
8890
name: {{ .Values.secret.db.secretRef }}
91+
key: {{ .Values.secret.db.secretRefKey.password | default "password" }}
8992
{{- else }}
9093
name: {{ include "supabase.secret.db" . }}
91-
{{- end }}
9294
key: password
95+
{{- end }}
9396
- name: PGDATABASE
9497
valueFrom:
9598
secretKeyRef:
9699
{{- if .Values.secret.db.secretRef }}
97100
name: {{ .Values.secret.db.secretRef }}
101+
key: {{ .Values.secret.db.secretRefKey.database | default "database" }}
98102
{{- else }}
99103
name: {{ include "supabase.secret.db" . }}
100-
{{- end }}
101104
key: database
105+
{{- end }}
102106
- name: POSTGRES_DB
103107
valueFrom:
104108
secretKeyRef:
105109
{{- if .Values.secret.db.secretRef }}
106110
name: {{ .Values.secret.db.secretRef }}
111+
key: {{ .Values.secret.db.secretRefKey.database | default "database" }}
107112
{{- else }}
108113
name: {{ include "supabase.secret.db" . }}
109-
{{- end }}
110114
key: database
115+
{{- end }}
111116
{{- with .Values.db.livenessProbe }}
112117
livenessProbe:
113118
{{- toYaml . | nindent 12 }}

‎charts/supabase/templates/functions/deployment.yaml

+11-6
Original file line numberDiff line numberDiff line change
@@ -54,16 +54,17 @@ spec:
5454
secretKeyRef:
5555
{{- if .Values.secret.db.secretRef }}
5656
name: {{ .Values.secret.db.secretRef }}
57+
key: {{ .Values.secret.db.secretRefKey.password | default "password" }}
5758
{{- else }}
5859
name: {{ include "supabase.secret.db" . }}
59-
{{- end }}
6060
key: password
61+
{{- end }}
6162
- name: DB_PASSWORD_ENC
6263
valueFrom:
6364
secretKeyRef:
6465
{{- if .Values.secret.db.secretRef }}
6566
name: {{ .Values.secret.db.secretRef }}
66-
key: password
67+
key: {{ .Values.secret.db.secretRefKey.password | default "password" }}
6768
{{- else }}
6869
name: {{ include "supabase.secret.db" . }}
6970
key: password_encoded
@@ -73,37 +74,41 @@ spec:
7374
secretKeyRef:
7475
{{- if .Values.secret.db.secretRef }}
7576
name: {{ .Values.secret.db.secretRef }}
77+
key: {{ .Values.secret.db.secretRefKey.database | default "database" }}
7678
{{- else }}
7779
name: {{ include "supabase.secret.db" . }}
78-
{{- end }}
7980
key: database
81+
{{- end }}
8082
- name: JWT_SECRET
8183
valueFrom:
8284
secretKeyRef:
8385
{{- if .Values.secret.jwt.secretRef }}
8486
name: {{ .Values.secret.jwt.secretRef }}
87+
key: {{ .Values.secret.jwt.secretRefKey.secret | default "secret" }}
8588
{{- else }}
8689
name: {{ include "supabase.secret.jwt" . }}
87-
{{- end }}
8890
key: secret
91+
{{- end }}
8992
- name: SUPABASE_ANON_KEY
9093
valueFrom:
9194
secretKeyRef:
9295
{{- if .Values.secret.jwt.secretRef }}
9396
name: {{ .Values.secret.jwt.secretRef }}
97+
key: {{ .Values.secret.jwt.secretRefKey.anonKey | default "anonKey" }}
9498
{{- else }}
9599
name: {{ include "supabase.secret.jwt" . }}
96-
{{- end }}
97100
key: anonKey
101+
{{- end }}
98102
- name: SUPABASE_SERVICE_ROLE_KEY
99103
valueFrom:
100104
secretKeyRef:
101105
{{- if .Values.secret.jwt.secretRef }}
102106
name: {{ .Values.secret.jwt.secretRef }}
107+
key: {{ .Values.secret.jwt.secretRefKey.serviceKey | default "serviceKey" }}
103108
{{- else }}
104109
name: {{ include "supabase.secret.jwt" . }}
105-
{{- end }}
106110
key: serviceKey
111+
{{- end }}
107112
- name: POSTGRES_BACKEND_URL
108113
value: $(DB_DRIVER)://$(DB_USERNAME):$(DB_PASSWORD_ENC)@$(DB_HOSTNAME):$(DB_PORT)/$(DB_DATABASE)?search_path=auth&sslmode=$(DB_SSL)
109114
{{- with .Values.functions.livenessProbe }}

‎charts/supabase/templates/kong/deployment.yaml

+8-4
Original file line numberDiff line numberDiff line change
@@ -46,38 +46,42 @@ spec:
4646
secretKeyRef:
4747
{{- if .Values.secret.jwt.secretRef }}
4848
name: {{ .Values.secret.jwt.secretRef }}
49+
key: {{ .Values.secret.jwt.secretRefKey.anonKey | default "anonKey" }}
4950
{{- else }}
5051
name: {{ include "supabase.secret.jwt" . }}
51-
{{- end }}
5252
key: anonKey
53+
{{- end }}
5354
- name: SUPABASE_SERVICE_KEY
5455
valueFrom:
5556
secretKeyRef:
5657
{{- if .Values.secret.jwt.secretRef }}
5758
name: {{ .Values.secret.jwt.secretRef }}
59+
key: {{ .Values.secret.jwt.secretRefKey.serviceKey | default "serviceKey" }}
5860
{{- else }}
5961
name: {{ include "supabase.secret.jwt" . }}
60-
{{- end }}
6162
key: serviceKey
63+
{{- end }}
6264
{{- if .Values.secret.dashboard }}
6365
- name: DASHBOARD_USERNAME
6466
valueFrom:
6567
secretKeyRef:
6668
{{- if .Values.secret.dashboard.secretRef }}
6769
name: {{ .Values.secret.dashboard.secretRef }}
70+
key: {{ .Values.secret.dashboard.secretRefKey.username | default "username" }}
6871
{{- else }}
6972
name: {{ include "supabase.secret.dashboard" . }}
70-
{{- end }}
7173
key: username
74+
{{- end }}
7275
- name: DASHBOARD_PASSWORD
7376
valueFrom:
7477
secretKeyRef:
7578
{{- if .Values.secret.dashboard.secretRef }}
7679
name: {{ .Values.secret.dashboard.secretRef }}
80+
key: {{ .Values.secret.dashboard.secretRefKey.password | default "password" }}
7781
{{- else }}
7882
name: {{ include "supabase.secret.dashboard" . }}
79-
{{- end }}
8083
key: password
84+
{{- end }}
8185
{{- end }}
8286
{{- with .Values.kong.livenessProbe }}
8387
livenessProbe:

‎charts/supabase/templates/meta/deployment.yaml

+4-2
Original file line numberDiff line numberDiff line change
@@ -48,19 +48,21 @@ spec:
4848
secretKeyRef:
4949
{{- if .Values.secret.db.secretRef }}
5050
name: {{ .Values.secret.db.secretRef }}
51+
key: {{ .Values.secret.db.secretRefKey.password | default "password" }}
5152
{{- else }}
5253
name: {{ include "supabase.secret.db" . }}
53-
{{- end }}
5454
key: password
55+
{{- end }}
5556
- name: DB_NAME
5657
valueFrom:
5758
secretKeyRef:
5859
{{- if .Values.secret.db.secretRef }}
5960
name: {{ .Values.secret.db.secretRef }}
61+
key: {{ .Values.secret.db.secretRefKey.database | default "database" }}
6062
{{- else }}
6163
name: {{ include "supabase.secret.db" . }}
62-
{{- end }}
6364
key: database
65+
{{- end }}
6466
- name: PG_META_DB_HOST
6567
value: $(DB_HOST)
6668
- name: PG_META_DB_PORT

‎charts/supabase/templates/realtime/deployment.yaml

+10-5
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,11 @@ spec:
4444
secretKeyRef:
4545
{{- if .Values.secret.db.secretRef }}
4646
name: {{ .Values.secret.db.secretRef }}
47+
key: {{ .Values.secret.db.secretRefKey.username | default "username" }}
4748
{{- else }}
4849
name: {{ include "supabase.secret.db" . }}
49-
{{- end }}
5050
key: username
51+
{{- end }}
5152
- name: DB_PORT
5253
value: {{ .Values.analytics.environment.DB_PORT | quote }}
5354
command: ["/bin/sh", "-c"]
@@ -80,37 +81,41 @@ spec:
8081
secretKeyRef:
8182
{{- if .Values.secret.db.secretRef }}
8283
name: {{ .Values.secret.db.secretRef }}
84+
key: {{ .Values.secret.db.secretRefKey.password | default "password" }}
8385
{{- else }}
8486
name: {{ include "supabase.secret.db" . }}
85-
{{- end }}
8687
key: password
88+
{{- end }}
8789
- name: DB_NAME
8890
valueFrom:
8991
secretKeyRef:
9092
{{- if .Values.secret.db.secretRef }}
9193
name: {{ .Values.secret.db.secretRef }}
94+
key: {{ .Values.secret.db.secretRefKey.database | default "database" }}
9295
{{- else }}
9396
name: {{ include "supabase.secret.db" . }}
94-
{{- end }}
9597
key: database
98+
{{- end }}
9699
- name: JWT_SECRET
97100
valueFrom:
98101
secretKeyRef:
99102
{{- if .Values.secret.jwt.secretRef }}
100103
name: {{ .Values.secret.jwt.secretRef }}
104+
key: {{ .Values.secret.jwt.secretRefKey.secret | default "secret" }}
101105
{{- else }}
102106
name: {{ include "supabase.secret.jwt" . }}
103-
{{- end }}
104107
key: secret
108+
{{- end }}
105109
- name: API_JWT_SECRET
106110
valueFrom:
107111
secretKeyRef:
108112
{{- if .Values.secret.jwt.secretRef }}
109113
name: {{ .Values.secret.jwt.secretRef }}
114+
key: {{ .Values.secret.jwt.secretRefKey.secret | default "secret" }}
110115
{{- else }}
111116
name: {{ include "supabase.secret.jwt" . }}
112-
{{- end }}
113117
key: secret
118+
{{- end }}
114119
{{- with .Values.realtime.livenessProbe }}
115120
livenessProbe:
116121
{{- toYaml . | nindent 12 }}

0 commit comments

Comments
 (0)