Skip to content

Commit 6244be7

Browse files
colek42colek42
authored
Merge branch 'main' into feat/customer-bucket-names
2 parents 9cf0018 + 3db1efc commit 6244be7

35 files changed

+274
-24
lines changed

‎charts/archivista/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: archivista
33
description: A Helm chart for Archivista
44

55
type: application
6-
version: 1.6.19
6+
version: 1.6.20
77

88
keywords:
99
- attestation

‎charts/archivista/templates/_helpers.tpl‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,22 +123,34 @@ Priority: local serviceAccount.name → global.secrets.vault.serviceAccounts.arc
123123

124124
{{/*
125125
Create the name of the secret to use for the connection string
126+
Configuration pattern: Supports global configuration via global.secrets.manual.archivista
127+
Priority: global.secrets.manual.archivista.secretName (if set) → local sqlStore.secretName → default
126128
*/}}
127129
{{- define "archivista.connectionStringSecret.name" -}}
128130
{{- if .Values.sqlStore.createSecret }}
129131
{{- default (include "archivista.fullname" .) .Values.sqlStore.secretName }}
130132
{{- else }}
131-
{{- default (printf "%s-database" (include "archivista.fullname" .)) .Values.sqlStore.secretName }}
133+
{{- if and .Values.global .Values.global.secrets .Values.global.secrets.manual .Values.global.secrets.manual.archivista .Values.global.secrets.manual.archivista.secretName -}}
134+
{{- .Values.global.secrets.manual.archivista.secretName -}}
135+
{{- else -}}
136+
{{- .Values.sqlStore.secretName | default (printf "%s-database" (include "archivista.fullname" .)) -}}
137+
{{- end -}}
132138
{{- end }}
133139
{{- end }}
134140
{{/*
135141
Create the key of the secret to use for the connection string
142+
Configuration pattern: Supports global configuration via global.secrets.manual.archivista
143+
Priority: global.secrets.manual.archivista.secretKey (if set) → local sqlStore.secretKey → default
136144
*/}}
137145
{{- define "archivista.connectionStringSecret.key" -}}
138146
{{- if .Values.sqlStore.createSecret }}
139147
{{- default "connectionstring" .Values.sqlStore.secretKey }}
140148
{{- else }}
141-
{{- .Values.sqlStore.secretKey }}
149+
{{- if and .Values.global .Values.global.secrets .Values.global.secrets.manual .Values.global.secrets.manual.archivista .Values.global.secrets.manual.archivista.secretKey -}}
150+
{{- .Values.global.secrets.manual.archivista.secretKey -}}
151+
{{- else -}}
152+
{{- .Values.sqlStore.secretKey | default "connectionString" -}}
153+
{{- end -}}
142154
{{- end }}
143155
{{- end }}
144156

‎charts/judge-api/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ apiVersion: v2
22
name: judge-api
33
description: A judge-api Helm chart for Kubernetes
44
type: application
5-
version: "1.6.19"
5+
version: "1.6.20"
66
appVersion: "1.0.0"

‎charts/judge-api/templates/_helpers.tpl‎

Lines changed: 31 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,16 @@ Precedence: .Values.image.repository (if non-empty) → .Values.global.registry.
44
*/}}
55
{{- define "judge.image.repository" -}}
66
{{- $chartName := default .Chart.Name .Values.nameOverride }}
7-
{{- $registryUrl := coalesce ((.Values.image).registry) ((.Values.global).registry.url | default "") "ghcr.io" }}
7+
{{- $globalRegistryUrl := "" }}
8+
{{- $globalRepo := "" }}
9+
{{- if .Values.global }}
10+
{{- if .Values.global.registry }}
11+
{{- $globalRegistryUrl = .Values.global.registry.url | default "" }}
12+
{{- $globalRepo = .Values.global.registry.repository | default "" }}
13+
{{- end }}
14+
{{- end }}
15+
{{- $registryUrl := coalesce ((.Values.image).registry) $globalRegistryUrl "ghcr.io" }}
816
{{- $localRepo := ((.Values.image).repository) | default "" }}
9-
{{- $globalRepo := ((.Values.global).registry.repository) | default "" }}
1017
{{- $repository := "" }}
1118
{{- if ne $localRepo "" }}
1219
{{- $repository = $localRepo }}
@@ -123,23 +130,43 @@ Priority: local serviceAccount.name → global.secrets.vault.serviceAccounts.jud
123130

124131
{{/*
125132
Create the name of the secret to use for the connection string
133+
Configuration pattern: Supports global configuration via global.secrets.manual.judgeApi
134+
Priority: local sqlStore.secretName → global.secrets.manual.judgeApi.secretName → default
126135
*/}}
127136
{{- define "judge-api.connectionStringSecret.name" -}}
128137
{{- if .Values.sqlStore.createSecret }}
129138
{{- default (include "judge-api.fullname" .) .Values.sqlStore.secretName }}
130139
{{- else }}
131-
{{- default (printf "%s-database" (include "judge-api.fullname" .)) .Values.sqlStore.secretName }}
140+
{{- $globalName := "" -}}
141+
{{- if and .Values.global (hasKey .Values.global "secrets") -}}
142+
{{- if and .Values.global.secrets (hasKey .Values.global.secrets "manual") -}}
143+
{{- if and .Values.global.secrets.manual (hasKey .Values.global.secrets.manual "judgeApi") -}}
144+
{{- if hasKey .Values.global.secrets.manual.judgeApi "secretName" -}}
145+
{{- $globalName = .Values.global.secrets.manual.judgeApi.secretName -}}
146+
{{- end -}}
147+
{{- end -}}
148+
{{- end -}}
149+
{{- end -}}
150+
{{- $localName := .Values.sqlStore.secretName | default "" -}}
151+
{{- $defaultName := printf "%s-database" (include "judge-api.fullname" .) -}}
152+
{{- coalesce $localName $globalName $defaultName -}}
132153
{{- end }}
133154
{{- end }}
134155

135156
{{/*
136157
Create the key of the secret to use for the connection string
158+
Configuration pattern: Supports global configuration via global.secrets.manual.judgeApi
159+
Priority: global.secrets.manual.judgeApi.secretKey (if set) → local sqlStore.secretKey → default
137160
*/}}
138161
{{- define "judge-api.connectionStringSecret.key" -}}
139162
{{- if .Values.sqlStore.createSecret }}
140163
{{- default "connectionstring" .Values.sqlStore.secretKey }}
141164
{{- else }}
142-
{{- .Values.sqlStore.secretKey }}
165+
{{- if and .Values.global .Values.global.secrets .Values.global.secrets.manual .Values.global.secrets.manual.judgeApi .Values.global.secrets.manual.judgeApi.secretKey -}}
166+
{{- .Values.global.secrets.manual.judgeApi.secretKey -}}
167+
{{- else -}}
168+
{{- .Values.sqlStore.secretKey | default "connectionString" -}}
169+
{{- end -}}
143170
{{- end }}
144171
{{- end }}
145172

‎charts/judge-api/values.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
replicaCount: 1
22
logLevel: "info"
33

4+
# Global values structure (for subchart to receive parent's global values)
5+
global:
6+
secrets:
7+
manual:
8+
judgeApi:
9+
secretName: ""
10+
secretKey: ""
11+
412
image:
513
registry: "" # Inherit from global.registry.url (marketplace or custom)
614
repository: "" # Inherit from global.registry.repository

‎charts/judge/Chart.lock‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ dependencies:
44
version: 0.1.17
55
- name: kratos
66
repository: file://../kratos
7-
version: 1.6.31
7+
version: 1.6.32
88
- name: kratos-selfservice-ui-node
99
repository: file://../kratos-selfservice-ui-node
1010
version: 1.6.9
1111
- name: archivista
1212
repository: file://../archivista
13-
version: 1.6.19
13+
version: 1.6.20
1414
- name: judge-api
1515
repository: file://../judge-api
16-
version: 1.6.19
16+
version: 1.6.20
1717
- name: dapr
1818
repository: file://../dapr
1919
version: 1.14.6
@@ -38,5 +38,5 @@ dependencies:
3838
- name: preview-router
3939
repository: file://../preview-router
4040
version: 0.1.1
41-
digest: sha256:696369f68cfa130bac69c3ed3402c1fb4529bcdde135dce5a8807a5d99a9bfe5
42-
generated: "2025-10-27T09:33:39.221415-05:00"
41+
digest: sha256:9995571ca607cbc4169145604816bf31cf97411a035af6078a2e40446f1d4bce
42+
generated: "2025-10-30T13:57:43.875851-05:00"

‎charts/judge/Chart.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ type: application
1616
# This is the chart version. This version number should be incremented each time you make changes
1717
# to the chart and its templates, including the app version.
1818
# Versions are expected to follow Semantic Versioning (https://semver.org/)
19-
version: "1.8.40"
19+
version: "1.8.42"
2020

2121
# This is the version number of the application being deployed. This version number should be
2222
# incremented each time you make changes to the application. Versions are not expected to
@@ -31,19 +31,19 @@ dependencies:
3131
repository: file://../judge-preflight
3232
condition: judge-preflight.enabled
3333
- name: kratos
34-
version: 1.6.31
34+
version: 1.6.32
3535
repository: file://../kratos
3636
condition: kratos.enabled
3737
- name: kratos-selfservice-ui-node
3838
version: 1.6.9
3939
repository: file://../kratos-selfservice-ui-node
4040
condition: kratos-selfservice-ui-node.enabled
4141
- name: archivista
42-
version: "1.6.19"
42+
version: "1.6.20"
4343
repository: file://../archivista
4444
condition: archivista.enabled
4545
- name: judge-api
46-
version: "1.6.19"
46+
version: "1.6.20"
4747
repository: file://../judge-api
4848
condition: judge-api.enabled
4949
- name: dapr

‎charts/judge/charts/archivista-1.6.19.tgz‎

-10.3 KB
Binary file not shown.

‎charts/judge/charts/archivista-1.6.20.tgz‎

10.4 KB
Binary file not shown.

‎charts/judge/charts/dapr-1.14.6.tgz‎

-2 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)