Skip to content

Chore: Reorganize files for maintainability #780

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
marcleblanc2 wants to merge 3 commits into
base: main
Choose a base branch
from
+340 −342
Open

Chore: Reorganize files for maintainability #780

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fab4609
Reorganize files
marcleblanc2 Dec 8, 2025
0f7d63c
Split up _helpers.tpl into smaller, more maintainable files
marcleblanc2 Dec 8, 2025
7d43ce5
Fix unit tests with changed file paths
marcleblanc2 Dec 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
294 changes: 0 additions & 294 deletions charts/sourcegraph/templates/_helpers.tpl
View file
Open in desktop

This file was deleted.

13 changes: 13 additions & 0 deletions charts/sourcegraph/templates/_helpers/_chart-name-and-version.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{{/*
Expand the name of the chart.
*/}}
{{- define "sourcegraph.name" -}}
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
{{- end }}

{{/*
Create chart name and version as used by the chart label.
*/}}
{{- define "sourcegraph.chart" -}}
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
{{- end }}
77 changes: 77 additions & 0 deletions charts/sourcegraph/templates/_helpers/_database.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
{{- define "sourcegraph.databaseAuth" -}}
{{- $top := index . 0 -}}
{{- $service := index . 1 -}}
{{- $prefix := index . 2 -}}
{{- $secretName := (index $top.Values $service "name") -}}
{{- $secretName := printf "%s-auth" $secretName -}}
{{- if (index $top.Values $service "auth" "existingSecret") }}{{- $secretName = (index $top.Values $service "auth" "existingSecret") }}{{- end -}}
- name: {{ printf "%sDATABASE" $prefix }}
valueFrom:
secretKeyRef:
key: database
name: {{ $secretName }}
- name: {{ printf "%sHOST" $prefix }}
valueFrom:
secretKeyRef:
key: host
name: {{ $secretName }}
- name: {{ printf "%sPASSWORD" $prefix }}
valueFrom:
secretKeyRef:
key: password
name: {{ $secretName }}
- name: {{ printf "%sPORT" $prefix }}
valueFrom:
secretKeyRef:
key: port
name: {{ $secretName }}
- name: {{ printf "%sUSER" $prefix }}
valueFrom:
secretKeyRef:
key: user
name: {{ $secretName }}
- name: {{ printf "%sSSLMODE" $prefix }}
valueFrom:
secretKeyRef:
key: sslmode
name: {{ $secretName }}
{{- end }}


{{- define "sourcegraph.dataSource" -}}
{{- $top := index . 0 -}}
{{- $service := index . 1 -}}
{{- $secretName := (index $top.Values $service "name") -}}
{{- $secretName := printf "%s-auth" $secretName -}}
{{- if (index $top.Values $service "auth" "existingSecret") }}{{- $secretName = (index $top.Values $service "auth" "existingSecret") }}{{- end -}}
- name: DATA_SOURCE_DB
valueFrom:
secretKeyRef:
key: database
name: {{ $secretName }}
- name: DATA_SOURCE_PASS
valueFrom:
secretKeyRef:
key: password
name: {{ $secretName }}
- name: DATA_SOURCE_PORT
valueFrom:
secretKeyRef:
key: port
name: {{ $secretName }}
- name: DATA_SOURCE_USER
valueFrom:
secretKeyRef:
key: user
name: {{ $secretName }}
- name: DATA_SOURCE_URI
value: "localhost:$(DATA_SOURCE_PORT)/$(DATA_SOURCE_DB)?sslmode=disable"
{{- end }}


{{- define "sourcegraph.authChecksum" -}}
{{- $checksum := list .Values.codeInsightsDB.auth -}}
{{- $checksum = append $checksum .Values.codeIntelDB.auth -}}
{{- $checksum = append $checksum .Values.pgsql.auth -}}
checksum/auth: {{ toJson $checksum | sha256sum }}
{{- end -}}
Loading
Loading