feat: extend cluster k8s_options with multi-vendor manifest support

- New k8s_pod_spec form sections (image credentials, node selector,
  gpu vendor overrides) under k8s_options, replacing the legacy flat
  k8s_volume_mounts list. UI keys aligned to the backend wire shape
  (snake_case k8s_options + camelCase inside).
- System default container registry is pre-filled into the first image
  credential when creating a new cluster; empty username/password are
  coerced to null on submit to match the Optional[str] backend schema.
- Register cluster flow supports multi-runtime selection gated by the
  cluster's gpuVendorOverrides: non-override vendors stay single-select
  with an inline hint; multi-add only opens once an override vendor is
  picked, and non-override cards become disabled in that state.
- Manifest URL emits multiple ?runtime= params; check-env step combines
  per-vendor commands; downstream steps are disabled when no vendor is
  selected.
- Pre-validate gpuVendorOverrides at save time (non-empty selector, no
  duplicates across vendors, no key clash with base nodeSelector) so
  the user sees the error before hitting the manifest endpoint.
- Misc: dark-mode background of the k8s_pod_spec / volume mount titles
  no longer clashes with the drawer; cluster Steps no longer leaks the
  internal showModules/showForms props to the DOM.
This commit is contained in:
Yuxing Deng
2026-05-26 16:54:14 +08:00
parent 91c3d0b814
commit acb90531b2
21 changed files with 1023 additions and 112 deletions
+24 -1
View File
@@ -69,6 +69,9 @@ export default {
'clusters.addworker.selectCluster.tips':
'For <span class="bold-text">non-Docker</span> clusters, please register clusters or manage worker pools from the Clusters page.',
'clusters.addworker.selectGPU': 'Select GPU Vendor',
'clusters.addworker.selectGPU.multiTag': 'Multi-select',
'clusters.addworker.selectGPU.singleOnly':
'The selected vendor is not in this clusters GPU vendor overrides — single-select only. Pick a vendor configured in the overrides to enable multi-select.',
'clusters.addworker.checkEnv': 'Check Environment',
'clusters.addworker.specifyArgs': 'Specify Arguments',
'clusters.addworker.runCommand': 'Run Command',
@@ -160,5 +163,25 @@ export default {
'clusters.volume.pvc.readOnly': 'Read Only',
'clusters.volume.configMap.name': 'ConfigMap Name',
'clusters.volume.configMap.optional': 'Optional',
'clusters.volume.add': 'Add Volume Mount'
'clusters.volume.add': 'Add Volume Mount',
'clusters.imageCredentials.title': 'Image Credentials',
'clusters.imageCredentials.add': 'Add Credential',
'clusters.imageCredentials.registry': 'Registry',
'clusters.imageCredentials.username': 'Username',
'clusters.imageCredentials.password': 'Password',
'clusters.nodeSelector.title': 'Node Selector',
'clusters.nodeSelector.tip':
'Pod nodeSelector applied to every worker DaemonSet — only nodes whose labels match are eligible to run the worker.',
'clusters.gpuVendorOverrides.title': 'GPU Vendor Overrides',
'clusters.gpuVendorOverrides.validate.emptySelector':
'The override for {vendor} needs at least one nodeSelector entry — an empty override would leave the multi-vendor manifest unable to target nodes for this runtime.',
'clusters.gpuVendorOverrides.validate.duplicate':
'Overrides for {v1} and {v2} use the same nodeSelector. Each vendor must scope to a distinct node set, otherwise their worker DaemonSets would compete for the same nodes.',
'clusters.gpuVendorOverrides.validate.keyConflict':
'Override for {vendor} reuses key(s) {keys} from the base Node Selector — the CPU worker would simultaneously require and forbid the key and never schedule.',
'clusters.gpuVendorOverrides.tip':
'Required when running multiple GPU vendors in one cluster. Each entry pins that vendors worker DaemonSet to nodes matching its nodeSelector, and the CPU worker is steered away from those nodes via a DoesNotExist node-affinity.',
'clusters.gpuVendorOverrides.add': 'Add Override',
'clusters.gpuVendorOverrides.vendor': 'GPU Vendor',
'clusters.gpuVendorOverrides.nodeSelector': 'Node Selector'
};
+24 -1
View File
@@ -69,6 +69,9 @@ export default {
'clusters.addworker.selectCluster.tips':
'For <span class="bold-text">non-Docker</span> clusters, please register clusters or manage worker pools from the Clusters page.',
'clusters.addworker.selectGPU': 'Select GPU Vendor',
'clusters.addworker.selectGPU.multiTag': 'Multi-select',
'clusters.addworker.selectGPU.singleOnly':
'The selected vendor is not in this clusters GPU vendor overrides — single-select only. Pick a vendor configured in the overrides to enable multi-select.',
'clusters.addworker.checkEnv': 'Check Environment',
'clusters.addworker.specifyArgs': 'Specify Arguments',
'clusters.addworker.runCommand': 'Run Command',
@@ -160,7 +163,27 @@ export default {
'clusters.volume.pvc.readOnly': 'Read Only',
'clusters.volume.configMap.name': 'ConfigMap Name',
'clusters.volume.configMap.optional': 'Optional',
'clusters.volume.add': 'Add Volume Mount'
'clusters.volume.add': 'Add Volume Mount',
'clusters.imageCredentials.title': 'Image Credentials',
'clusters.imageCredentials.add': 'Add Credential',
'clusters.imageCredentials.registry': 'Registry',
'clusters.imageCredentials.username': 'Username',
'clusters.imageCredentials.password': 'Password',
'clusters.nodeSelector.title': 'Node Selector',
'clusters.nodeSelector.tip':
'Pod nodeSelector applied to every worker DaemonSet — only nodes whose labels match are eligible to run the worker.',
'clusters.gpuVendorOverrides.title': 'GPU Vendor Overrides',
'clusters.gpuVendorOverrides.validate.emptySelector':
'The override for {vendor} needs at least one nodeSelector entry — an empty override would leave the multi-vendor manifest unable to target nodes for this runtime.',
'clusters.gpuVendorOverrides.validate.duplicate':
'Overrides for {v1} and {v2} use the same nodeSelector. Each vendor must scope to a distinct node set, otherwise their worker DaemonSets would compete for the same nodes.',
'clusters.gpuVendorOverrides.validate.keyConflict':
'Override for {vendor} reuses key(s) {keys} from the base Node Selector — the CPU worker would simultaneously require and forbid the key and never schedule.',
'clusters.gpuVendorOverrides.tip':
'Required when running multiple GPU vendors in one cluster. Each entry pins that vendors worker DaemonSet to nodes matching its nodeSelector, and the CPU worker is steered away from those nodes via a DoesNotExist node-affinity.',
'clusters.gpuVendorOverrides.add': 'Add Override',
'clusters.gpuVendorOverrides.vendor': 'GPU Vendor',
'clusters.gpuVendorOverrides.nodeSelector': 'Node Selector'
};
// ========== To-Do: Translate Keys (Remove After Translation) ==========
+24 -1
View File
@@ -69,6 +69,9 @@ export default {
'clusters.addworker.selectCluster.tips':
'Для <span class="bold-text">не-Docker</span> кластеров, пожалуйста, регистрируйте кластеры или управляйте пулами воркеров на странице Кластеры.',
'clusters.addworker.selectGPU': 'Выбрать производителя GPU',
'clusters.addworker.selectGPU.multiTag': 'Multi-select',
'clusters.addworker.selectGPU.singleOnly':
'The selected vendor is not in this clusters GPU vendor overrides — single-select only. Pick a vendor configured in the overrides to enable multi-select.',
'clusters.addworker.checkEnv': 'Проверить окружение',
'clusters.addworker.specifyArgs': 'Указать аргументы',
'clusters.addworker.runCommand': 'Выполнить команду',
@@ -161,7 +164,27 @@ export default {
'clusters.volume.pvc.readOnly': 'Read Only',
'clusters.volume.configMap.name': 'ConfigMap Name',
'clusters.volume.configMap.optional': 'Optional',
'clusters.volume.add': 'Add Volume Mount'
'clusters.volume.add': 'Add Volume Mount',
'clusters.imageCredentials.title': 'Image Credentials',
'clusters.imageCredentials.add': 'Add Credential',
'clusters.imageCredentials.registry': 'Registry',
'clusters.imageCredentials.username': 'Username',
'clusters.imageCredentials.password': 'Password',
'clusters.nodeSelector.title': 'Node Selector',
'clusters.nodeSelector.tip':
'Pod nodeSelector applied to every worker DaemonSet — only nodes whose labels match are eligible to run the worker.',
'clusters.gpuVendorOverrides.title': 'GPU Vendor Overrides',
'clusters.gpuVendorOverrides.validate.emptySelector':
'The override for {vendor} needs at least one nodeSelector entry — an empty override would leave the multi-vendor manifest unable to target nodes for this runtime.',
'clusters.gpuVendorOverrides.validate.duplicate':
'Overrides for {v1} and {v2} use the same nodeSelector. Each vendor must scope to a distinct node set, otherwise their worker DaemonSets would compete for the same nodes.',
'clusters.gpuVendorOverrides.validate.keyConflict':
'Override for {vendor} reuses key(s) {keys} from the base Node Selector — the CPU worker would simultaneously require and forbid the key and never schedule.',
'clusters.gpuVendorOverrides.tip':
'Required when running multiple GPU vendors in one cluster. Each entry pins that vendors worker DaemonSet to nodes matching its nodeSelector, and the CPU worker is steered away from those nodes via a DoesNotExist node-affinity.',
'clusters.gpuVendorOverrides.add': 'Add Override',
'clusters.gpuVendorOverrides.vendor': 'GPU Vendor',
'clusters.gpuVendorOverrides.nodeSelector': 'Node Selector'
};
// ========== To-Do: Translate Keys (Remove After Translation) ==========
+24 -1
View File
@@ -69,6 +69,9 @@ export default {
'clusters.addworker.selectCluster.tips':
'<span class="bold-text">Docker dışı</span> kümeler için lütfen Kümeler sayfasından küme kaydı oluşturun veya işçi havuzlarını yönetin.',
'clusters.addworker.selectGPU': 'GPU Üreticisi Seç',
'clusters.addworker.selectGPU.multiTag': 'Multi-select',
'clusters.addworker.selectGPU.singleOnly':
'The selected vendor is not in this clusters GPU vendor overrides — single-select only. Pick a vendor configured in the overrides to enable multi-select.',
'clusters.addworker.checkEnv': 'Ortamı Kontrol Et',
'clusters.addworker.specifyArgs': 'Argümanları Belirle',
'clusters.addworker.runCommand': 'Komutu Çalıştır',
@@ -161,5 +164,25 @@ export default {
'clusters.volume.pvc.readOnly': 'Read Only',
'clusters.volume.configMap.name': 'ConfigMap Name',
'clusters.volume.configMap.optional': 'Optional',
'clusters.volume.add': 'Add Volume Mount'
'clusters.volume.add': 'Add Volume Mount',
'clusters.imageCredentials.title': 'Image Credentials',
'clusters.imageCredentials.add': 'Add Credential',
'clusters.imageCredentials.registry': 'Registry',
'clusters.imageCredentials.username': 'Username',
'clusters.imageCredentials.password': 'Password',
'clusters.nodeSelector.title': 'Node Selector',
'clusters.nodeSelector.tip':
'Pod nodeSelector applied to every worker DaemonSet — only nodes whose labels match are eligible to run the worker.',
'clusters.gpuVendorOverrides.title': 'GPU Vendor Overrides',
'clusters.gpuVendorOverrides.validate.emptySelector':
'The override for {vendor} needs at least one nodeSelector entry — an empty override would leave the multi-vendor manifest unable to target nodes for this runtime.',
'clusters.gpuVendorOverrides.validate.duplicate':
'Overrides for {v1} and {v2} use the same nodeSelector. Each vendor must scope to a distinct node set, otherwise their worker DaemonSets would compete for the same nodes.',
'clusters.gpuVendorOverrides.validate.keyConflict':
'Override for {vendor} reuses key(s) {keys} from the base Node Selector — the CPU worker would simultaneously require and forbid the key and never schedule.',
'clusters.gpuVendorOverrides.tip':
'Required when running multiple GPU vendors in one cluster. Each entry pins that vendors worker DaemonSet to nodes matching its nodeSelector, and the CPU worker is steered away from those nodes via a DoesNotExist node-affinity.',
'clusters.gpuVendorOverrides.add': 'Add Override',
'clusters.gpuVendorOverrides.vendor': 'GPU Vendor',
'clusters.gpuVendorOverrides.nodeSelector': 'Node Selector'
};
+24 -1
View File
@@ -67,6 +67,9 @@ export default {
'clusters.addworker.selectCluster.tips':
'<span class="bold-text">非 Docker</span> 集群请前往集群页面注册集群或管理节点池。',
'clusters.addworker.selectGPU': '选择 GPU 厂商',
'clusters.addworker.selectGPU.multiTag': '可多选',
'clusters.addworker.selectGPU.singleOnly':
'当前所选厂商未在集群的 GPU 厂商覆盖(override node selector)中配置,仅支持单选。如需多选,请先选择 override 中已配置的厂商。',
'clusters.addworker.checkEnv': '检查环境',
'clusters.addworker.specifyArgs': '指定参数',
'clusters.addworker.runCommand': '运行指令',
@@ -153,5 +156,25 @@ export default {
'clusters.volume.pvc.readOnly': '只读',
'clusters.volume.configMap.name': '配置名称',
'clusters.volume.configMap.optional': '可选',
'clusters.volume.add': '添加卷挂载'
'clusters.volume.add': '添加卷挂载',
'clusters.imageCredentials.title': '镜像仓库凭证',
'clusters.imageCredentials.add': '添加凭证',
'clusters.imageCredentials.registry': '镜像仓库地址',
'clusters.imageCredentials.username': '用户名',
'clusters.imageCredentials.password': '密码',
'clusters.nodeSelector.title': '节点选择器',
'clusters.nodeSelector.tip':
'应用到每个 worker DaemonSet 的 Pod nodeSelector,只有标签匹配的节点才会被调度运行 worker。',
'clusters.gpuVendorOverrides.title': 'GPU 厂商覆盖配置',
'clusters.gpuVendorOverrides.validate.emptySelector':
'{vendor} 的覆盖配置至少需要一项 nodeSelector —— 空覆盖会让多 vendor manifest 无法定位该 runtime 的节点。',
'clusters.gpuVendorOverrides.validate.duplicate':
'{v1} 与 {v2} 的覆盖配置使用了完全相同的 nodeSelector。每个 vendor 必须对应不同的节点集,否则它们的 worker DaemonSet 会相互争抢同一批节点。',
'clusters.gpuVendorOverrides.validate.keyConflict':
'{vendor} 的覆盖配置重用了基础节点选择器中已有的 key({keys})—— 这会让 CPU worker 同时"要求"和"禁止"这些 key,永远无法被调度。',
'clusters.gpuVendorOverrides.tip':
'集群中存在多个 GPU 厂商时必填。每项的 nodeSelector 将该厂商的 worker DaemonSet 固定到匹配的节点,同时 CPU worker 通过 DoesNotExist 节点亲和性避开这些节点。',
'clusters.gpuVendorOverrides.add': '添加覆盖配置',
'clusters.gpuVendorOverrides.vendor': 'GPU 厂商',
'clusters.gpuVendorOverrides.nodeSelector': '节点选择器'
};