chore: helm for multirm kubeconfig_path (#9033)

determined-ai · Mar 21, 2024 · c811947 · c811947
1 parent 4441d6d
commit c811947
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/helm/charts/determined/templates/master-config.yaml b/helm/charts/determined/templates/master-config.yaml
@@ -174,7 +174,13 @@ 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}}

diff --git a/helm/charts/determined/templates/master-deployment.yaml b/helm/charts/determined/templates/master-deployment.yaml
@@ -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" . }}
@@ -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)}}