Skip to content

Commit d0a9f00

Browse files
authored
feat(chart): Remove SQL proxy dependency (#1164)
Signed-off-by: Javier Rodriguez <[email protected]>
1 parent 36d71ae commit d0a9f00

File tree

6 files changed

+11
-113
lines changed

6 files changed

+11
-113
lines changed

deployment/chainloop/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ description: Chainloop is an open source software supply chain control plane, a
77

88
type: application
99
# Bump the patch (not minor, not major) version on each change in the Chart Source code
10-
version: 1.83.3
10+
version: 1.83.4
1111
# Do not update appVersion, this is handled automatically by the release process
1212
appVersion: v0.95.0
1313

deployment/chainloop/README.md

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -529,17 +529,14 @@ chainloop config save \
529529

530530
### Control Plane Database
531531

532-
| Name | Description | Value |
533-
| ---------------------------------------- | ----------------------------------------------------------------------------------------------------- | ------- |
534-
| `controlplane.externalDatabase` | External PostgreSQL configuration. These values are only used when postgresql.enabled is set to false | |
535-
| `controlplane.externalDatabase.host` | Database host | `""` |
536-
| `controlplane.externalDatabase.port` | Database port number | `5432` |
537-
| `controlplane.externalDatabase.user` | Non-root username | `""` |
538-
| `controlplane.externalDatabase.database` | Database name | `""` |
539-
| `controlplane.externalDatabase.password` | Password for the non-root username | `""` |
540-
| `controlplane.sqlProxy.enabled` | Enable sidecar to connect to DB via Google Cloud SQL proxy | `false` |
541-
| `controlplane.sqlProxy.connectionName` | Google Cloud SQL connection name | `""` |
542-
| `controlplane.sqlProxy.resources` | Sidecar container resources | `{}` |
532+
| Name | Description | Value |
533+
| ---------------------------------------- | ----------------------------------------------------------------------------------------------------- | ------ |
534+
| `controlplane.externalDatabase` | External PostgreSQL configuration. These values are only used when postgresql.enabled is set to false | |
535+
| `controlplane.externalDatabase.host` | Database host | `""` |
536+
| `controlplane.externalDatabase.port` | Database port number | `5432` |
537+
| `controlplane.externalDatabase.user` | Non-root username | `""` |
538+
| `controlplane.externalDatabase.database` | Database name | `""` |
539+
| `controlplane.externalDatabase.password` | Password for the non-root username | `""` |
543540

544541
### Control Plane Authentication
545542

deployment/chainloop/templates/_helpers.tpl

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -225,22 +225,14 @@ Return the Postgresql connection string for Atlas migration
225225
Return the Postgresql hostname
226226
*/}}
227227
{{- define "controlplane.database.host" -}}
228-
{{- if .Values.controlplane.sqlProxy.enabled }}
229-
{{- include "chainloop.sql-proxy.fullname" . -}}
230-
{{- else -}}
231-
{{- ternary (include "chainloop.postgresql.fullname" .) .Values.controlplane.externalDatabase.host .Values.postgresql.enabled -}}
232-
{{- end -}}
228+
{{- ternary (include "chainloop.postgresql.fullname" .) .Values.controlplane.externalDatabase.host .Values.postgresql.enabled -}}
233229
{{- end -}}
234230

235231
{{/*
236232
Return the Postgresql port
237233
*/}}
238234
{{- define "controlplane.database.port" -}}
239-
{{- if .Values.controlplane.sqlProxy.enabled }}
240-
{{- 5432 -}}
241-
{{- else -}}
242-
{{- ternary 5432 .Values.controlplane.externalDatabase.port .Values.postgresql.enabled -}}
243-
{{- end -}}
235+
{{- ternary 5432 .Values.controlplane.externalDatabase.port .Values.postgresql.enabled -}}
244236
{{- end -}}
245237

246238
{{/*

deployment/chainloop/templates/controlplane/deployment_sqlproxy.yaml

Lines changed: 0 additions & 61 deletions
This file was deleted.

deployment/chainloop/templates/controlplane/service_sql-proxy.yaml

Lines changed: 0 additions & 22 deletions
This file was deleted.

deployment/chainloop/values.yaml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -197,14 +197,6 @@ controlplane:
197197
database: ""
198198
password: ""
199199

200-
sqlProxy:
201-
## @param controlplane.sqlProxy.enabled Enable sidecar to connect to DB via Google Cloud SQL proxy
202-
enabled: false
203-
## @param controlplane.sqlProxy.connectionName Google Cloud SQL connection name
204-
connectionName: ""
205-
## @param controlplane.sqlProxy.resources Sidecar container resources
206-
resources: {}
207-
208200
## @section Control Plane Authentication
209201
auth:
210202
## @param controlplane.auth.passphrase Passphrase used to sign the Auth Tokens generated by the controlplane. Leave empty for auto-generation

0 commit comments

Comments
 (0)