panxiao81/helm-charts-hardened
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update to Tornjak 2.1.0 (#597)

Browse Source 
* Update to Tornjak 2.1.0

Signed-off-by: Alan Cha <[email protected]>

* Address comments

Signed-off-by: Alan Cha <[email protected]>

* Fix Tornjak tests

Signed-off-by: Alan Cha <[email protected]>

* revert namespace change

Signed-off-by: Alan Cha <[email protected]>

---------

Signed-off-by: Alan Cha <[email protected]>
This commit is contained in:
Alan Cha
2025-07-02 14:42:18 -07:00
committed by GitHub
parent f37d681bc2
commit 255106da84
6 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
charts/spire/charts/spire-server/templates/tests/test-tornjak-connection.yaml
+2 -2
View File
@@ -17,13 +17,13 @@ spec:
- name: curl-tornjak-backend
image: {{ template "spire-lib.image" (dict "image" .Values.tests.bash.image "global" .Values.global) }}
command: ['curl']
args: ['-k', '-s', '-f', 'http://{{ include "spire-tornjak.servicename" . }}.{{ include "spire-server.namespace" . }}.svc.{{ include "spire-lib.cluster-domain" . }}:{{ .Values.tornjak.service.ports.http }}/api/tornjak/serverinfo']
args: ['-k', '-s', '-f', 'http://{{ include "spire-tornjak.servicename" . }}.{{ include "spire-server.namespace" . }}.svc.{{ include "spire-lib.cluster-domain" . }}:{{ .Values.tornjak.service.ports.http }}/api/v1/tornjak/serverinfo']
securityContext:
{{- include "spire-lib.securitycontext" . | nindent 8 }}
- name: curl-tornjak-backend-and-spire
image: {{ template "spire-lib.image" (dict "image" .Values.tests.bash.image "global" .Values.global) }}
command: ['curl']
args: ['-k', '-s', '-f', 'http://{{ include "spire-tornjak.servicename" . }}.{{ include "spire-server.namespace" . }}.svc.{{ include "spire-lib.cluster-domain" . }}:{{ .Values.tornjak.service.ports.http }}/api/healthcheck']
args: ['-k', '-s', '-f', 'http://{{ include "spire-tornjak.servicename" . }}.{{ include "spire-server.namespace" . }}.svc.{{ include "spire-lib.cluster-domain" . }}:{{ .Values.tornjak.service.ports.http }}/api/v1/spire/healthcheck']
securityContext:
{{- include "spire-lib.securitycontext" . | nindent 8 }}
restartPolicy: Never
charts/spire/charts/spire-server/templates/tornjak-config.yaml
+4 -7
View File
@@ -10,25 +10,22 @@ data:
spire_socket_path = "unix:///tmp/spire-server/private/api.sock" # socket to communicate with SPIRE server
{{- if eq (include "spire-tornjak.connectionType" .) "http" }}
http {
enabled = true # if true, opens HTTP server
port = "10000" # if HTTP enabled, opens HTTP listen port at specified container port
}
{{- end }}
{{- if eq (include "spire-tornjak.connectionType" .) "tls" }}
tls {
enabled = true
https {
port = "10443" # container port for TLS connection
cert = "/opt/spire/server/tls.crt" # TLS server cert
key = "/opt/spire/server/tls.key" # TLS server key
}
{{- end }}
{{- if eq (include "spire-tornjak.connectionType" .) "mtls" }}
mtls {
enabled = true
https {
port = "10443" # container port for mTLS connection
cert = "/opt/spire/server/tls.crt" # mTLS server cert
key = "/opt/spire/server/tls.key" # mTLS server key
ca = "/opt/spire/user/ca.crt" # mTLS user CA
client_ca = "/opt/spire/user/ca.crt" # mTLS user CA
}
{{- end }}
}
@@ -43,7 +40,7 @@ data:
}
{{- end }}
{{- if ne .Values.tornjak.config.userManagement.issuer "" }}
UserManagement "KeycloakAuth" {
Authenticator "Keycloak" {
plugin_data {
issuer = "{{ .Values.tornjak.config.userManagement.issuer }}"
audience = "{{ .Values.tornjak.config.userManagement.audience }}"