remove dra from charts

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:

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:

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:

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:

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:

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:

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:

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

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

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

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 }}

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 }}
+    namespace: {{ include "hami-vgpu.namespace" . }}

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

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 }}

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 }}

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

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

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

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

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

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

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

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

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 }}
+    verbs: ["create", "list", "watch", "get", "update", "patch"]

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 }}

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 }}

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 }}

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:

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: