Skip to content

Template external secrets configs injection #286

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

Merged
merged 1 commit into from
Feb 10, 2025
Merged

Template external secrets configs injection #286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions charts/trino/templates/deployment-coordinator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,25 +98,25 @@ spec:
{{- range .Values.configMounts }}
- name: {{ .name }}
configMap:
name: {{ .configMap }}
name: {{ tpl .configMap $ }}
{{- end }}
{{- range .Values.coordinator.configMounts }}
- name: {{ .name }}
configMap:
name: {{ .configMap }}
name: {{ tpl .configMap $ }}
{{- end }}
{{- range .Values.secretMounts }}
- name: {{ .name }}
secret:
secretName: {{ .secretName }}
secretName: {{ tpl .secretName $ }}
{{- end }}
{{- range .Values.coordinator.secretMounts }}
- name: {{ .name }}
secret:
secretName: {{ .secretName }}
secretName: {{ tpl .secretName $ }}
{{- end }}
{{- with .Values.coordinator.additionalVolumes }}
{{- . | toYaml | nindent 8 }}
{{- tpl (. | toYaml) $ | nindent 8 }}
{{- end }}
{{- if .Values.initContainers.coordinator }}
initContainers:
Expand All @@ -136,7 +136,7 @@ spec:
env:
{{- toYaml .Values.env | nindent 12 }}
envFrom:
{{- toYaml .Values.envFrom | nindent 12 }}
{{- tpl (toYaml .Values.envFrom) . | nindent 12 }}
volumeMounts:
- mountPath: {{ .Values.server.config.path }}
name: config-volume
Expand Down
12 changes: 6 additions & 6 deletions charts/trino/templates/deployment-worker.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,25 +80,25 @@ spec:
{{- range .Values.configMounts }}
- name: {{ .name }}
configMap:
name: {{ .configMap }}
name: {{ tpl .configMap $ }}
{{- end }}
{{- range .Values.worker.configMounts }}
- name: {{ .name }}
configMap:
name: {{ .configMap }}
name: {{ tpl .configMap $ }}
{{- end }}
{{- range .Values.secretMounts }}
- name: {{ .name }}
secret:
secretName: {{ .secretName }}
secretName: {{ tpl .secretName $ }}
{{- end }}
{{- range .Values.worker.secretMounts }}
- name: {{ .name }}
secret:
secretName: {{ .secretName }}
secretName: {{ tpl .secretName $ }}
{{- end }}
{{- with .Values.worker.additionalVolumes }}
{{- . | toYaml | nindent 8 }}
{{- tpl (. | toYaml) $ | nindent 8 }}
{{- end }}
{{- if .Values.initContainers.worker }}
initContainers:
Expand All @@ -122,7 +122,7 @@ spec:
env:
{{- toYaml .Values.env | nindent 12 }}
envFrom:
{{- toYaml .Values.envFrom | nindent 12 }}
{{- tpl (toYaml .Values.envFrom) . | nindent 12 }}
volumeMounts:
- mountPath: {{ .Values.server.config.path }}
name: config-volume
Expand Down
2 changes: 1 addition & 1 deletion charts/trino/templates/ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
{{- range .hosts }}
- {{ . | quote }}
{{- end }}
secretName: {{ .secretName }}
secretName: {{ tpl .secretName $ }}
{{- end }}
{{- end }}
rules:
Expand Down
2 changes: 1 addition & 1 deletion charts/trino/templates/tests/test-connection.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,6 @@ spec:
volumes:
- name: certificates
secret:
secretName: certificates
secretName: {{ .Release.Namespace }}-certificates
{{- end }}
restartPolicy: Never
2 changes: 1 addition & 1 deletion tests/trino/test-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ auth:

secretMounts:
- name: certificates
secretName: certificates
secretName: '{{ .Release.Namespace }}-certificates'
path: /etc/trino/certificates

coordinator:
Expand Down
2 changes: 1 addition & 1 deletion tests/trino/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ openssl req -new -newkey rsa:4096 -days 365 -nodes -x509 \
-keyout cert.key -out cert.crt

kubectl create namespace "$NAMESPACE" --dry-run=client --output yaml | kubectl apply --filename -
kubectl -n "$NAMESPACE" create secret tls certificates --cert=cert.crt --key=cert.key --dry-run=client --output yaml | kubectl apply --filename -
kubectl -n "$NAMESPACE" create secret tls "$NAMESPACE"-certificates --cert=cert.crt --key=cert.key --dry-run=client --output yaml | kubectl apply --filename -
cat <<YAML | kubectl -n "$NAMESPACE" apply -f-
apiVersion: v1
kind: PersistentVolumeClaim
Expand Down
Loading