Skip to content
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.

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

chore: helm for multirm kubeconfig_path #9015

Merged
merged 10 commits into from
Mar 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 9 additions & 1 deletion helm/charts/determined/templates/master-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,15 @@ stringData:

{{- if .Values.additional_resource_managers}}
additional_resource_managers:
{{- toYaml .Values.additional_resource_managers | nindent 4}}
{{- range $index, $manager_and_pools := .Values.additional_resource_managers }}
- resource_manager:
{{- omit $manager_and_pools.resource_manager
"kubeconfig_secret_name" "kubeconfig_secret_value" |
toYaml | nindent 8 }}
kubeconfig_path: {{ include "determined.secretPath" . }}{{ $index }}/{{ required "for each additional_resource_managers, resource_manager.kubeconfig_secret_value must be specified" $manager_and_pools.resource_manager.kubeconfig_secret_value }}
resource_pools:
{{- toYaml $manager_and_pools.resource_pools | nindent 8}}
{{- end }}
{{- end }}

{{- if .Values.resourcePools}}
Expand Down
10 changes: 10 additions & 0 deletions helm/charts/determined/templates/master-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,11 @@ spec:
mountPath: {{ include "determined.secretPath" . }}
readOnly: true
{{ end }}
{{- range $index, $manager := .Values.additional_resource_managers }}
- name: additionalrm-kubeconfig{{ $index }}
mountPath: {{ include "determined.secretPath" . }}{{ $index }}/
readOnly: true
{{- end }}
{{- if .Values.db.certResourceName }}
- name: database-cert
mountPath: {{ include "determined.secretPath" . }}
Expand Down Expand Up @@ -128,6 +133,11 @@ spec:
secret:
secretName: {{ .Values.tlsSecret }}
{{- end }}
{{- range $index, $manager := .Values.additional_resource_managers }}
- name: additionalrm-kubeconfig{{ $index }}
secret:
secretName: {{ required "for each additional_resource_managers, resource_manager.kubeconfig_secret_name must be specified" $manager.resource_manager.kubeconfig_secret_name }}
{{- end }}
{{- if .Values.db.sslMode }}
- name: database-cert
{{- $resourceType := (required "A valid .Values.db.resourceType entry required!" .Values.db.resourceType | trim)}}
Expand Down
Loading