Update rancher-hami chart

cnrancher · Dec 27, 2024 · 82f236e · 82f236e
1 parent 2c8d1f9
commit 82f236e
Show file tree

Hide file tree

Showing 12 changed files with 230 additions and 77 deletions.
diff --git a/assets/rancher-hami/rancher-hami-103.0.0+up2.4.1.tgz b/assets/rancher-hami/rancher-hami-103.0.0+up2.4.1.tgz
diff --git a/charts/rancher-hami/103.0.0+up2.4.1/Chart.yaml b/charts/rancher-hami/103.0.0+up2.4.1/Chart.yaml
@@ -10,8 +10,7 @@ annotations:
 apiVersion: v2
 appVersion: 2.4.1
 dependencies:
-- condition: hami-webui.enabled
-  name: hami-webui
+- name: hami-webui
   repository: file://./charts/hami-webui
   version: 1.0.3
 description: Heterogeneous AI Computing Virtualization Middleware

diff --git a/charts/rancher-hami/103.0.0+up2.4.1/charts/hami-webui/templates/service-rancher-rbac.yaml b/charts/rancher-hami/103.0.0+up2.4.1/charts/hami-webui/templates/service-rancher-rbac.yaml
@@ -0,0 +1,23 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: {{ include "hami-webui.fullname" . }}-service-role
+  namespace: {{ include "hami-webui.namespace" . }}
+rules:
+- apiGroups: [""]
+  resources: ["services","services/proxy"]
+  verbs: ["get", "list", "watch"]
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: {{ include "hami-webui.fullname" . }}-service-role-binding
+  namespace: {{ include "hami-webui.namespace" . }}
+subjects:
+- kind: Group
+  name: system:authenticated
+  apiGroup: rbac.authorization.k8s.io
+roleRef:
+  kind: Role
+  name: {{ include "hami-webui.fullname" . }}-service-role
+  apiGroup: rbac.authorization.k8s.io
diff --git a/charts/rancher-hami/103.0.0+up2.4.1/questions.yaml b/charts/rancher-hami/103.0.0+up2.4.1/questions.yaml
@@ -1,9 +1,19 @@
 questions:
 # device plugin configurations
-- variable: devicePlugin.runtimeClassName
-  type: string
-  label: RuntimeClassName
+- variable: useRuntimeClass
+  default: false
+  description: "Use runtime class"
+  type: boolean
+  label: Use runtime class
   group: "Device Plugin Config"
+  show_subquestion_if: true
+  subquestions:
+  - variable: devicePlugin.runtimeClassName
+    type: string
+    description: "Set runtimeClassName for device plugin if runtime class is used for container runtime."
+    label: RuntimeClassName
+    required: true
+    group: "Device Plugin Config"
 - variable: devicePlugin.migStrategy
   description: '"none" for ignoring MIG features or "mixed" for allocating MIG device by seperate resources. Default "none"'
   type: enum
@@ -25,25 +35,34 @@ questions:
   group: "Device Plugin Config"
 
 # hami-webui configurations
-- variable: hami-webui.enabled
-  default: true
-  description: "Enable HAMi WebUI"
+- variable: useRuntimeClass
+  default: false
+  description: "Use runtime class"
   type: boolean
-  label: Enable HAMi WebUI
+  label: Use runtime class
   group: "HAMi WebUI"
   show_subquestion_if: true
   subquestions:
-  - variable: hami-webui.image.frontend.repository
-    description: "HAMi webui image repository"
+  - variable: hami-webui.dcgm-exporter.runtimeClassName
     type: string
-    label: HAMi webui Image Repository
-  - variable: hami-webui.image.frontend.tag
-    description: "HAMi webui image tag"
-    type: string
-    label: HAMi webui Image Tag
+    description: "Set runtimeClassName for dcgm-exporter if runtime class is used for container runtime."
+    label: RuntimeClassName
+    required: true
+    group: "HAMi WebUI"
+
+- variable: hami-webui.image.frontend.repository
+  description: "HAMi webui image repository"
+  type: string
+  label: HAMi webui Image Repository
+  group: "HAMi WebUI"
+- variable: hami-webui.image.frontend.tag
+  description: "HAMi webui image tag"
+  type: string
+  label: HAMi webui Image Tag
+  group: "HAMi WebUI"
 
 # scheduler configurations
-- variable: defaultSchedulerPolicy.nodeSchedulerPolicy
+- variable: scheduler.defaultSchedulerPolicy.nodeSchedulerPolicy
   description: "Default value is binpack, representing the GPU node scheduling policy. binpack means trying to allocate tasks to the same GPU node as much as possible, while spread means trying to allocate tasks to different GPU nodes as much as possible."
   type: enum
   default: "binpack"
@@ -52,7 +71,7 @@ questions:
     - spread
   label: Node Scheduler Policy
   group: "Scheduler Config"
-- variable: defaultSchedulerPolicy.gpuSchedulerPolicy
+- variable: scheduler.defaultSchedulerPolicy.gpuSchedulerPolicy
   description: "Default value is spread, representing the GPU scheduling policy. binpack means trying to allocate tasks to the same GPU as much as possible, while spread means trying to allocate tasks to different GPUs as much as possible."
   type: enum
   default: "spread"
@@ -62,24 +81,19 @@ questions:
   label: GPU Scheduler Policy
   group: "Scheduler Config"
 
-- variable: scheduler.kubeScheduler.enabled
-  default: true
-  description: "Enable run kube-scheduler container in the scheduler pod"
-  type: boolean
-  label: Run Kube Scheduler in the scheduler pod
+- variable: scheduler.kubeScheduler.image.repository
+  default: "cnrancher/mirrored-projecthami-kube-scheduler"
+  description: "Kube Scheduler image repository"
+  type: string
+  label: Kube Scheduler Image Repository
   group: "Scheduler Config"
-  show_subquestion_if: true
-  subquestions:
-  - variable: scheduler.kubeScheduler.image.repository
-    default: "cnrancher/mirrored-projecthami-kube-scheduler"
-    description: "Kube Scheduler image repository"
-    type: string
-    label: Kube Scheduler Image Repository
-  - variable: scheduler.kubeScheduler.image.tag
-    default: ""
-    description: "Kube Scheduler image tag. Default is empty and will use the k8s cluster version."
-    type: string
-    label: Kube Scheduler Image Tag
+- variable: scheduler.kubeScheduler.image.tag
+  default: ""
+  description: "Kube Scheduler image tag. Default is empty and will use the k8s cluster version."
+  type: string
+  label: Kube Scheduler Image Tag
+  group: "Scheduler Config"
+
 - variable: scheduler.extender.image.repository
   description: "Scheduler extender image repository"
   type: string

diff --git a/charts/rancher-hami/103.0.0+up2.4.1/templates/rancher/resourceTypes.yaml b/charts/rancher-hami/103.0.0+up2.4.1/templates/rancher/resourceTypes.yaml
@@ -2,6 +2,8 @@ apiVersion: "hami.pandaria.com/v1"
 kind: ResourceType
 metadata:
   name: rancher-hami-resourcetypes
+  labels:
+    hami.pandaria.com/installed-by-chart: "true"
 spec:
   resourceTypes:
     - {{ .Values.resourceName }}
@@ -28,3 +30,25 @@ spec:
     - {{ . }}
     {{- end }}
     {{- end }}
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: rancher-hami-resourcetypes-view-role
+rules:
+- apiGroups: ["hami.pandaria.com"]
+  resources: ["resourcetypes"]
+  verbs: ["get", "list"]
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: rancher-hami-resourcetypes-view-role-binding
+subjects:
+- kind: Group
+  name: system:authenticated
+  apiGroup: rbac.authorization.k8s.io
+roleRef:
+  kind: ClusterRole
+  name: rancher-hami-resourcetypes-view-role
+  apiGroup: rbac.authorization.k8s.io
diff --git a/charts/rancher-hami/103.0.0+up2.4.1/values.yaml b/charts/rancher-hami/103.0.0+up2.4.1/values.yaml
@@ -162,7 +162,6 @@ devices:
       - huawei.com/Ascend310P-memory
 
 hami-webui:
-  enabled: true
   image:
     frontend:
       repository: cnrancher/hami-webui-fe-oss
@@ -177,3 +176,18 @@ hami-webui:
     image:
       repository: cnrancher/mirrored-nvidia-dcgm-exporter
       tag: 3.3.7-3.5.0-ubuntu22.04
+    runtimeClassName: ""
+
+rancherImages:
+  k8s-1-25:
+    repository: "cnrancher/mirrored-projecthami-kube-scheduler"
+    tag: "v1.25.16"
+  k8s-1-26:
+    repository: "cnrancher/mirrored-projecthami-kube-scheduler"
+    tag: "v1.26.15"
+  k8s-1-27:
+    repository: "cnrancher/mirrored-projecthami-kube-scheduler"
+    tag: "v1.27.16"
+  k8s-1-28:
+    repository: "cnrancher/mirrored-projecthami-kube-scheduler"
+    tag: "v1.28.15"
diff --git a/index.yaml b/index.yaml
@@ -833,14 +833,13 @@ entries:
       catalog.cattle.io/release-name: rancher-hami
     apiVersion: v2
     appVersion: 2.4.1
-    created: "2024-12-24T11:59:48.410226+08:00"
+    created: "2024-12-27T15:46:21.011325+08:00"
     dependencies:
-    - condition: hami-webui.enabled
-      name: hami-webui
+    - name: hami-webui
       repository: file://./charts/hami-webui
       version: 1.0.3
     description: Heterogeneous AI Computing Virtualization Middleware
-    digest: 2c6c3253471b51faa73099e42a68a86e45f743f04e97cb467f135e0502cea4fe
+    digest: 7a5c36fe59e4ee2d62b39675cdb7100699745865c0ba546fa22d8025e7174ac1
     keywords:
     - vgpu
     - gpu

diff --git a/...cher-hami/generated-changes/overlay/charts/hami-webui/templates/service-rancher-rbac.yaml b/...cher-hami/generated-changes/overlay/charts/hami-webui/templates/service-rancher-rbac.yaml
@@ -0,0 +1,23 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: {{ include "hami-webui.fullname" . }}-service-role
+  namespace: {{ include "hami-webui.namespace" . }}
+rules:
+- apiGroups: [""]
+  resources: ["services","services/proxy"]
+  verbs: ["get", "list", "watch"]
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: {{ include "hami-webui.fullname" . }}-service-role-binding
+  namespace: {{ include "hami-webui.namespace" . }}
+subjects:
+- kind: Group
+  name: system:authenticated
+  apiGroup: rbac.authorization.k8s.io
+roleRef:
+  kind: Role
+  name: {{ include "hami-webui.fullname" . }}-service-role
+  apiGroup: rbac.authorization.k8s.io
diff --git a/packages/rancher-hami/generated-changes/overlay/questions.yaml b/packages/rancher-hami/generated-changes/overlay/questions.yaml
@@ -1,9 +1,19 @@
 questions:
 # device plugin configurations
-- variable: devicePlugin.runtimeClassName
-  type: string
-  label: RuntimeClassName
+- variable: useRuntimeClass
+  default: false
+  description: "Use runtime class"
+  type: boolean
+  label: Use runtime class
   group: "Device Plugin Config"
+  show_subquestion_if: true
+  subquestions:
+  - variable: devicePlugin.runtimeClassName
+    type: string
+    description: "Set runtimeClassName for device plugin if runtime class is used for container runtime."
+    label: RuntimeClassName
+    required: true
+    group: "Device Plugin Config"
 - variable: devicePlugin.migStrategy
   description: '"none" for ignoring MIG features or "mixed" for allocating MIG device by seperate resources. Default "none"'
   type: enum
@@ -25,25 +35,34 @@ questions:
   group: "Device Plugin Config"
 
 # hami-webui configurations
-- variable: hami-webui.enabled
-  default: true
-  description: "Enable HAMi WebUI"
+- variable: useRuntimeClass
+  default: false
+  description: "Use runtime class"
   type: boolean
-  label: Enable HAMi WebUI
+  label: Use runtime class
   group: "HAMi WebUI"
   show_subquestion_if: true
   subquestions:
-  - variable: hami-webui.image.frontend.repository
-    description: "HAMi webui image repository"
+  - variable: hami-webui.dcgm-exporter.runtimeClassName
     type: string
-    label: HAMi webui Image Repository
-  - variable: hami-webui.image.frontend.tag
-    description: "HAMi webui image tag"
-    type: string
-    label: HAMi webui Image Tag
+    description: "Set runtimeClassName for dcgm-exporter if runtime class is used for container runtime."
+    label: RuntimeClassName
+    required: true
+    group: "HAMi WebUI"
+
+- variable: hami-webui.image.frontend.repository
+  description: "HAMi webui image repository"
+  type: string
+  label: HAMi webui Image Repository
+  group: "HAMi WebUI"
+- variable: hami-webui.image.frontend.tag
+  description: "HAMi webui image tag"
+  type: string
+  label: HAMi webui Image Tag
+  group: "HAMi WebUI"
 
 # scheduler configurations
-- variable: defaultSchedulerPolicy.nodeSchedulerPolicy
+- variable: scheduler.defaultSchedulerPolicy.nodeSchedulerPolicy
   description: "Default value is binpack, representing the GPU node scheduling policy. binpack means trying to allocate tasks to the same GPU node as much as possible, while spread means trying to allocate tasks to different GPU nodes as much as possible."
   type: enum
   default: "binpack"
@@ -52,7 +71,7 @@ questions:
     - spread
   label: Node Scheduler Policy
   group: "Scheduler Config"
-- variable: defaultSchedulerPolicy.gpuSchedulerPolicy
+- variable: scheduler.defaultSchedulerPolicy.gpuSchedulerPolicy
   description: "Default value is spread, representing the GPU scheduling policy. binpack means trying to allocate tasks to the same GPU as much as possible, while spread means trying to allocate tasks to different GPUs as much as possible."
   type: enum
   default: "spread"
@@ -62,24 +81,19 @@ questions:
   label: GPU Scheduler Policy
   group: "Scheduler Config"
 
-- variable: scheduler.kubeScheduler.enabled
-  default: true
-  description: "Enable run kube-scheduler container in the scheduler pod"
-  type: boolean
-  label: Run Kube Scheduler in the scheduler pod
+- variable: scheduler.kubeScheduler.image.repository
+  default: "cnrancher/mirrored-projecthami-kube-scheduler"
+  description: "Kube Scheduler image repository"
+  type: string
+  label: Kube Scheduler Image Repository
   group: "Scheduler Config"
-  show_subquestion_if: true
-  subquestions:
-  - variable: scheduler.kubeScheduler.image.repository
-    default: "cnrancher/mirrored-projecthami-kube-scheduler"
-    description: "Kube Scheduler image repository"
-    type: string
-    label: Kube Scheduler Image Repository
-  - variable: scheduler.kubeScheduler.image.tag
-    default: ""
-    description: "Kube Scheduler image tag. Default is empty and will use the k8s cluster version."
-    type: string
-    label: Kube Scheduler Image Tag
+- variable: scheduler.kubeScheduler.image.tag
+  default: ""
+  description: "Kube Scheduler image tag. Default is empty and will use the k8s cluster version."
+  type: string
+  label: Kube Scheduler Image Tag
+  group: "Scheduler Config"
+
 - variable: scheduler.extender.image.repository
   description: "Scheduler extender image repository"
   type: string