diff --git a/charts/hami/Chart.lock b/charts/hami/Chart.lock deleted file mode 100644 index e818da76c7..0000000000 --- a/charts/hami/Chart.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: hami-dra - repository: https://project-hami.github.io/HAMi-DRA/ - version: 0.2.0 -digest: sha256:560025a3c26590eec8cb0d73e74ef9255e2d52e5c1b4f829694fd309cd45b5c3 -generated: "2026-05-08T16:02:02.292237+08:00" diff --git a/charts/hami/Chart.yaml b/charts/hami/Chart.yaml index 12a17bf88b..868803f7fe 100644 --- a/charts/hami/Chart.yaml +++ b/charts/hami/Chart.yaml @@ -23,12 +23,6 @@ version: 2.9.0 # It is recommended to use it with quotes. appVersion: "2.9.0" -dependencies: - - name: hami-dra - version: "0.2.0" - repository: "https://project-hami.github.io/HAMi-DRA/" - condition: dra.enabled - kubeVersion: ">= 1.18.0-0" keywords: diff --git a/charts/hami/charts/hami-dra-0.2.0.tgz b/charts/hami/charts/hami-dra-0.2.0.tgz deleted file mode 100644 index c74f7db337..0000000000 Binary files a/charts/hami/charts/hami-dra-0.2.0.tgz and /dev/null differ diff --git a/charts/hami/templates/device-plugin/configmap.yaml b/charts/hami/templates/device-plugin/configmap.yaml index b36347f2ff..db2ddacb0c 100644 --- a/charts/hami/templates/device-plugin/configmap.yaml +++ b/charts/hami/templates/device-plugin/configmap.yaml @@ -1,4 +1,4 @@ -{{- if and .Values.devicePlugin.enabled (not .Values.devicePlugin.nodeConfiguration.externalConfigName) (not .Values.dra.enabled) -}} +{{- if and .Values.devicePlugin.enabled (not .Values.devicePlugin.nodeConfiguration.externalConfigName) -}} apiVersion: v1 kind: ConfigMap metadata: diff --git a/charts/hami/templates/device-plugin/daemonsetnvidia.yaml b/charts/hami/templates/device-plugin/daemonsetnvidia.yaml index ab09f73eae..0e785c363b 100644 --- a/charts/hami/templates/device-plugin/daemonsetnvidia.yaml +++ b/charts/hami/templates/device-plugin/daemonsetnvidia.yaml @@ -1,4 +1,4 @@ -{{- if and .Values.devicePlugin.enabled (not .Values.dra.enabled) }} +{{- if .Values.devicePlugin.enabled }} apiVersion: apps/v1 kind: DaemonSet metadata: diff --git a/charts/hami/templates/device-plugin/monitorrole.yaml b/charts/hami/templates/device-plugin/monitorrole.yaml index c51ff6c678..377f6a86eb 100644 --- a/charts/hami/templates/device-plugin/monitorrole.yaml +++ b/charts/hami/templates/device-plugin/monitorrole.yaml @@ -1,4 +1,4 @@ -{{- if and .Values.devicePlugin.enabled (not .Values.dra.enabled) -}} +{{- if .Values.devicePlugin.enabled -}} apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: diff --git a/charts/hami/templates/device-plugin/monitorrolebinding.yaml b/charts/hami/templates/device-plugin/monitorrolebinding.yaml index 93a118dd7f..2f0a14ba9b 100644 --- a/charts/hami/templates/device-plugin/monitorrolebinding.yaml +++ b/charts/hami/templates/device-plugin/monitorrolebinding.yaml @@ -1,4 +1,4 @@ -{{- if and .Values.devicePlugin.enabled (not .Values.dra.enabled) -}} +{{- if .Values.devicePlugin.enabled -}} apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: diff --git a/charts/hami/templates/device-plugin/monitorservice.yaml b/charts/hami/templates/device-plugin/monitorservice.yaml index 24daca9bc2..0fb156cc53 100644 --- a/charts/hami/templates/device-plugin/monitorservice.yaml +++ b/charts/hami/templates/device-plugin/monitorservice.yaml @@ -1,4 +1,4 @@ -{{- if and .Values.devicePlugin.enabled (not .Values.dra.enabled) -}} +{{- if .Values.devicePlugin.enabled -}} apiVersion: v1 kind: Service metadata: diff --git a/charts/hami/templates/device-plugin/monitorserviceaccount.yaml b/charts/hami/templates/device-plugin/monitorserviceaccount.yaml index b10d2cb99c..6e3c2a44ff 100644 --- a/charts/hami/templates/device-plugin/monitorserviceaccount.yaml +++ b/charts/hami/templates/device-plugin/monitorserviceaccount.yaml @@ -1,4 +1,4 @@ -{{- if and .Values.devicePlugin.enabled (not .Values.dra.enabled) -}} +{{- if .Values.devicePlugin.enabled -}} apiVersion: v1 kind: ServiceAccount metadata: diff --git a/charts/hami/templates/device-plugin/runtime-class.yaml b/charts/hami/templates/device-plugin/runtime-class.yaml index cd3d14ccbc..7f6e711951 100644 --- a/charts/hami/templates/device-plugin/runtime-class.yaml +++ b/charts/hami/templates/device-plugin/runtime-class.yaml @@ -1,4 +1,4 @@ -{{- if and .Values.devicePlugin.enabled (not .Values.dra.enabled) -}} +{{- if .Values.devicePlugin.enabled -}} {{- if and .Values.devicePlugin.createRuntimeClass .Values.devicePlugin.runtimeClassName }} apiVersion: node.k8s.io/v1 kind: RuntimeClass diff --git a/charts/hami/templates/device-plugin/servicemonitor.yaml b/charts/hami/templates/device-plugin/servicemonitor.yaml index 216773d966..f943c148bd 100644 --- a/charts/hami/templates/device-plugin/servicemonitor.yaml +++ b/charts/hami/templates/device-plugin/servicemonitor.yaml @@ -1,4 +1,4 @@ -{{- if and .Values.devicePlugin.enabled (not .Values.dra.enabled) (.Capabilities.APIVersions.Has "monitoring.coreos.com/v1/ServiceMonitor") .Values.prometheus.enabled }} +{{- if and .Values.devicePlugin.enabled (.Capabilities.APIVersions.Has "monitoring.coreos.com/v1/ServiceMonitor") .Values.prometheus.enabled }} # Prometheus Service Monitor apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor diff --git a/charts/hami/templates/scheduler/certmanager.yaml b/charts/hami/templates/scheduler/certmanager.yaml index b6edb605fe..e6d287215e 100644 --- a/charts/hami/templates/scheduler/certmanager.yaml +++ b/charts/hami/templates/scheduler/certmanager.yaml @@ -1,4 +1,4 @@ -{{- if and .Values.scheduler.admissionWebhook.enabled (not .Values.dra.enabled) -}} +{{- if .Values.scheduler.admissionWebhook.enabled -}} {{- if .Values.scheduler.certManager.enabled }} apiVersion: cert-manager.io/v1 kind: Certificate diff --git a/charts/hami/templates/scheduler/clusterrole.yaml b/charts/hami/templates/scheduler/clusterrole.yaml index 666ce2d86a..81c4fddf36 100644 --- a/charts/hami/templates/scheduler/clusterrole.yaml +++ b/charts/hami/templates/scheduler/clusterrole.yaml @@ -1,4 +1,3 @@ -{{- if not .Values.dra.enabled -}} apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: @@ -22,9 +21,6 @@ rules: - apiGroups: [""] resources: ["resourcequotas"] verbs: ["get", "list", "watch"] - - apiGroups: ["resource.k8s.io"] - resources: ["deviceclasses", "resourceclaims", "resourceclaimtemplates", "resourceslices"] - verbs: ["get", "list", "watch"] --- {{- if .Values.mockDevicePlugin.enabled }} apiVersion: rbac.authorization.k8s.io/v1 @@ -36,4 +32,3 @@ rules: resources: ["nodes"] verbs: ["get", "update", "list", "patch"] {{- end -}} -{{- end }} diff --git a/charts/hami/templates/scheduler/clusterrolebinding.yaml b/charts/hami/templates/scheduler/clusterrolebinding.yaml index 69d759868a..aa0f3c6631 100644 --- a/charts/hami/templates/scheduler/clusterrolebinding.yaml +++ b/charts/hami/templates/scheduler/clusterrolebinding.yaml @@ -1,4 +1,3 @@ -{{- if not .Values.dra.enabled -}} apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: @@ -45,5 +44,4 @@ roleRef: subjects: - kind: ServiceAccount name: {{ include "hami-vgpu.scheduler" . }} - namespace: {{ include "hami-vgpu.namespace" . }} -{{- end }} \ No newline at end of file + namespace: {{ include "hami-vgpu.namespace" . }} \ No newline at end of file diff --git a/charts/hami/templates/scheduler/configmap.yaml b/charts/hami/templates/scheduler/configmap.yaml index 934f852fde..960e2b0d87 100644 --- a/charts/hami/templates/scheduler/configmap.yaml +++ b/charts/hami/templates/scheduler/configmap.yaml @@ -1,4 +1,4 @@ -{{- if and .Values.scheduler.kubeScheduler.enabled (not .Values.dra.enabled) -}} +{{- if .Values.scheduler.kubeScheduler.enabled -}} {{- $k8sMinor := regexReplaceAll "[^0-9]" .Capabilities.KubeVersion.Minor "" | int -}} apiVersion: v1 kind: ConfigMap diff --git a/charts/hami/templates/scheduler/deployment.yaml b/charts/hami/templates/scheduler/deployment.yaml index 09f9926983..00525e71ae 100644 --- a/charts/hami/templates/scheduler/deployment.yaml +++ b/charts/hami/templates/scheduler/deployment.yaml @@ -1,4 +1,3 @@ -{{- if not .Values.dra.enabled -}} apiVersion: apps/v1 kind: Deployment metadata: @@ -229,4 +228,3 @@ spec: {{- if .Values.scheduler.nodeName }} nodeName: {{ .Values.scheduler.nodeName }} {{- end }} -{{- end }} diff --git a/charts/hami/templates/scheduler/device-configmap.yaml b/charts/hami/templates/scheduler/device-configmap.yaml index d3cd5a0c1f..1e900d3ce0 100644 --- a/charts/hami/templates/scheduler/device-configmap.yaml +++ b/charts/hami/templates/scheduler/device-configmap.yaml @@ -1,4 +1,3 @@ -{{- if not .Values.dra.enabled -}} apiVersion: v1 kind: ConfigMap metadata: @@ -454,4 +453,3 @@ data: aiCore: 10 aiCPU: 3 {{ end }} -{{- end }} diff --git a/charts/hami/templates/scheduler/job-patch/clusterrole.yaml b/charts/hami/templates/scheduler/job-patch/clusterrole.yaml index b089ae8298..9f36840785 100644 --- a/charts/hami/templates/scheduler/job-patch/clusterrole.yaml +++ b/charts/hami/templates/scheduler/job-patch/clusterrole.yaml @@ -1,4 +1,4 @@ -{{- if and .Values.scheduler.admissionWebhook.enabled (not .Values.dra.enabled) -}} +{{- if .Values.scheduler.admissionWebhook.enabled -}} {{- if and (.Values.scheduler.patch.enabled) (not .Values.scheduler.certManager.enabled) }} apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole diff --git a/charts/hami/templates/scheduler/job-patch/clusterrolebinding.yaml b/charts/hami/templates/scheduler/job-patch/clusterrolebinding.yaml index 64f01ecf32..290087249b 100644 --- a/charts/hami/templates/scheduler/job-patch/clusterrolebinding.yaml +++ b/charts/hami/templates/scheduler/job-patch/clusterrolebinding.yaml @@ -1,4 +1,4 @@ -{{- if and .Values.scheduler.admissionWebhook.enabled (not .Values.dra.enabled) -}} +{{- if .Values.scheduler.admissionWebhook.enabled -}} {{- if and (.Values.scheduler.patch.enabled) (not .Values.scheduler.certManager.enabled) }} apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding diff --git a/charts/hami/templates/scheduler/job-patch/job-createSecret.yaml b/charts/hami/templates/scheduler/job-patch/job-createSecret.yaml index 400168a706..6fdd192877 100644 --- a/charts/hami/templates/scheduler/job-patch/job-createSecret.yaml +++ b/charts/hami/templates/scheduler/job-patch/job-createSecret.yaml @@ -1,4 +1,4 @@ -{{- if and .Values.scheduler.admissionWebhook.enabled (not .Values.dra.enabled) -}} +{{- if .Values.scheduler.admissionWebhook.enabled -}} {{- if and (.Values.scheduler.patch.enabled) (not .Values.scheduler.certManager.enabled) }} apiVersion: batch/v1 kind: Job diff --git a/charts/hami/templates/scheduler/job-patch/job-patchWebhook.yaml b/charts/hami/templates/scheduler/job-patch/job-patchWebhook.yaml index 71e97f6b36..c417646dfd 100644 --- a/charts/hami/templates/scheduler/job-patch/job-patchWebhook.yaml +++ b/charts/hami/templates/scheduler/job-patch/job-patchWebhook.yaml @@ -1,4 +1,4 @@ -{{- if and .Values.scheduler.admissionWebhook.enabled (not .Values.dra.enabled) -}} +{{- if .Values.scheduler.admissionWebhook.enabled -}} {{- if and (.Values.scheduler.patch.enabled) (not .Values.scheduler.certManager.enabled) }} apiVersion: batch/v1 kind: Job diff --git a/charts/hami/templates/scheduler/job-patch/psp.yaml b/charts/hami/templates/scheduler/job-patch/psp.yaml index a48270e775..ccfcb07f04 100644 --- a/charts/hami/templates/scheduler/job-patch/psp.yaml +++ b/charts/hami/templates/scheduler/job-patch/psp.yaml @@ -1,4 +1,4 @@ -{{- if and .Values.scheduler.admissionWebhook.enabled (not .Values.dra.enabled) -}} +{{- if .Values.scheduler.admissionWebhook.enabled -}} {{- if and (.Values.scheduler.patch.enabled) (not .Values.scheduler.certManager.enabled) }} {{- if .Values.podSecurityPolicy.enabled }} apiVersion: policy/v1beta1 diff --git a/charts/hami/templates/scheduler/job-patch/role.yaml b/charts/hami/templates/scheduler/job-patch/role.yaml index 74e456815c..14be5744eb 100644 --- a/charts/hami/templates/scheduler/job-patch/role.yaml +++ b/charts/hami/templates/scheduler/job-patch/role.yaml @@ -1,4 +1,4 @@ -{{- if and .Values.scheduler.admissionWebhook.enabled (not .Values.dra.enabled) -}} +{{- if .Values.scheduler.admissionWebhook.enabled -}} {{- if and (.Values.scheduler.patch.enabled) (not .Values.scheduler.certManager.enabled) }} apiVersion: rbac.authorization.k8s.io/v1 kind: Role diff --git a/charts/hami/templates/scheduler/job-patch/rolebinding.yaml b/charts/hami/templates/scheduler/job-patch/rolebinding.yaml index 32da5ba481..b914065b4d 100644 --- a/charts/hami/templates/scheduler/job-patch/rolebinding.yaml +++ b/charts/hami/templates/scheduler/job-patch/rolebinding.yaml @@ -1,4 +1,4 @@ -{{- if and .Values.scheduler.admissionWebhook.enabled (not .Values.dra.enabled) -}} +{{- if .Values.scheduler.admissionWebhook.enabled -}} {{- if and (.Values.scheduler.patch.enabled) (not .Values.scheduler.certManager.enabled) }} apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding diff --git a/charts/hami/templates/scheduler/job-patch/serviceaccount.yaml b/charts/hami/templates/scheduler/job-patch/serviceaccount.yaml index d2eb41debe..43dbe971c2 100644 --- a/charts/hami/templates/scheduler/job-patch/serviceaccount.yaml +++ b/charts/hami/templates/scheduler/job-patch/serviceaccount.yaml @@ -1,4 +1,4 @@ -{{- if and .Values.scheduler.admissionWebhook.enabled (not .Values.dra.enabled) }} +{{- if .Values.scheduler.admissionWebhook.enabled }} {{- if and (.Values.scheduler.patch.enabled) (not .Values.scheduler.certManager.enabled) }} apiVersion: v1 kind: ServiceAccount diff --git a/charts/hami/templates/scheduler/role.yaml b/charts/hami/templates/scheduler/role.yaml index 6e68196795..90987a4ff7 100644 --- a/charts/hami/templates/scheduler/role.yaml +++ b/charts/hami/templates/scheduler/role.yaml @@ -1,4 +1,3 @@ -{{- if not .Values.dra.enabled -}} apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: @@ -10,5 +9,4 @@ metadata: rules: - apiGroups: ["coordination.k8s.io"] resources: ["leases"] - verbs: ["create", "list", "watch", "get", "update", "patch"] -{{- end }} \ No newline at end of file + verbs: ["create", "list", "watch", "get", "update", "patch"] \ No newline at end of file diff --git a/charts/hami/templates/scheduler/rolebinding.yaml b/charts/hami/templates/scheduler/rolebinding.yaml index 934f822352..96e175a18a 100644 --- a/charts/hami/templates/scheduler/rolebinding.yaml +++ b/charts/hami/templates/scheduler/rolebinding.yaml @@ -1,4 +1,3 @@ -{{- if not .Values.dra.enabled -}} apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: @@ -30,4 +29,3 @@ subjects: name: {{ include "hami-vgpu.mock-device-plugin" . }} namespace: {{ include "hami-vgpu.namespace" . }} {{- end -}} -{{- end }} diff --git a/charts/hami/templates/scheduler/service.yaml b/charts/hami/templates/scheduler/service.yaml index 6d26cea313..0cf62bda32 100644 --- a/charts/hami/templates/scheduler/service.yaml +++ b/charts/hami/templates/scheduler/service.yaml @@ -1,4 +1,3 @@ -{{- if not .Values.dra.enabled }} apiVersion: v1 kind: Service metadata: @@ -34,4 +33,3 @@ spec: app.kubernetes.io/component: hami-scheduler hami.io/scheduler-role: leader {{- include "hami-vgpu.selectorLabels" . | nindent 4 }} -{{- end }} diff --git a/charts/hami/templates/scheduler/serviceaccount.yaml b/charts/hami/templates/scheduler/serviceaccount.yaml index 929bf59ab5..0435c00395 100644 --- a/charts/hami/templates/scheduler/serviceaccount.yaml +++ b/charts/hami/templates/scheduler/serviceaccount.yaml @@ -1,4 +1,3 @@ -{{- if not .Values.dra.enabled -}} apiVersion: v1 kind: ServiceAccount metadata: @@ -15,4 +14,3 @@ metadata: name: {{ include "hami-vgpu.mock-device-plugin" . }} namespace: {{ include "hami-vgpu.namespace" . }} {{- end -}} -{{- end }} diff --git a/charts/hami/templates/scheduler/webhook.yaml b/charts/hami/templates/scheduler/webhook.yaml index 98ab05b226..d46a109cfd 100644 --- a/charts/hami/templates/scheduler/webhook.yaml +++ b/charts/hami/templates/scheduler/webhook.yaml @@ -1,4 +1,4 @@ -{{- if and .Values.scheduler.admissionWebhook.enabled (not .Values.dra.enabled) -}} +{{- if .Values.scheduler.admissionWebhook.enabled -}} apiVersion: admissionregistration.k8s.io/v1 kind: MutatingWebhookConfiguration metadata: diff --git a/charts/hami/values.yaml b/charts/hami/values.yaml index 2e33c2c880..98d763dc07 100644 --- a/charts/hami/values.yaml +++ b/charts/hami/values.yaml @@ -442,24 +442,6 @@ mockDevicePlugin: ## - myRegistryKeySecretName ## pullSecrets: [] -# If this option is enabled, the DRA will be installed and the scheduler extender will not be installed. -dra: - enabled: false - -# Configuration for the hami-dra subchart, which includes DRA drivers. -# This is part of config for DRA, please refer to the DRA documentation for more details. -hami-dra: - monitor: - enabled: true - drivers: - nvidia: - enabled: true - # If you are using gpu driver on host, you need to set this to false - containerDriver: true - image: - repository: ghcr.io/project-hami/k8s-dra-driver - tag: "main" - devices: amd: customresources: