refactor: update service configurations for device plugin and scheduler (#799)

Signed-off-by: haitwang-cloud <[email protected]>

Author: haitwang-cloud

charts/hami/templates/device-plugin/monitorservice.yaml

@@ -5,19 +5,22 @@ metadata:
   labels:
     app.kubernetes.io/component: hami-device-plugin
     {{- include "hami-vgpu.labels" . | nindent 4 }}
-    {{- if .Values.scheduler.service.labels }}
-    {{ toYaml .Values.scheduler.service.labels | indent 4 }}
+    {{- if .Values.devicePlugin.service.labels }}  # Use devicePlugin instead of scheduler
+    {{ toYaml .Values.devicePlugin.service.labels | indent 4 }}
     {{- end }}
-  {{- if .Values.scheduler.service.annotations }}
-  annotations: {{ toYaml .Values.scheduler.service.annotations | nindent 4 }}
+  {{- if .Values.devicePlugin.service.annotations }}  # Use devicePlugin instead of scheduler
+  annotations: {{ toYaml .Values.devicePlugin.service.annotations | nindent 4 }}
   {{- end }}
 spec:
-  externalTrafficPolicy: Local
-  selector:
-    app.kubernetes.io/component: hami-device-plugin
-  type: NodePort
+  type: {{ .Values.devicePlugin.service.type | default "NodePort" }}  # Default type is NodePort
   ports:
     - name: monitorport
-      port: {{ .Values.devicePlugin.service.httpPort }}
+      port: {{ .Values.devicePlugin.service.httpPort | default 31992 }}  # Default HTTP port is 31992
       targetPort: 9394
-      nodePort: {{ .Values.devicePlugin.service.httpPort }}
+      {{- if eq (.Values.devicePlugin.service.type | default "NodePort") "NodePort" }}  # If type is NodePort, set nodePort
+      nodePort: {{ .Values.devicePlugin.service.httpPort | default 31992 }}
+      {{- end }}
+      protocol: TCP
+  selector:
+    app.kubernetes.io/component: hami-device-plugin
+    {{- include "hami-vgpu.selectorLabels" . | nindent 4 }}

charts/hami/templates/scheduler/service.yaml

@@ -12,19 +12,22 @@ metadata:
   annotations: {{ toYaml .Values.scheduler.service.annotations | nindent 4 }}
   {{- end }}
 spec:
-  type: NodePort
+  type: {{ .Values.scheduler.service.type | default "NodePort" }}  # Default type is NodePort
   ports:
     - name: http
-      port: {{ .Values.scheduler.service.httpPort }}
-      targetPort: 443
-      nodePort: {{ .Values.scheduler.service.schedulerPort }}
+      port: {{ .Values.scheduler.service.httpPort | default 443 }}  # Default HTTP port is 443
+      targetPort: {{ .Values.scheduler.service.httpTargetPort | default 443 }}
+      {{- if eq (.Values.scheduler.service.type | default "NodePort") "NodePort" }}  # If type is NodePort, set nodePort
+      nodePort: {{ .Values.scheduler.service.schedulerPort | default 31998 }}
+      {{- end }}
       protocol: TCP
     - name: monitor
-      port: {{ .Values.scheduler.service.monitorPort }}
-      targetPort: {{ (split ":" (printf "%s" .Values.scheduler.metricsBindAddress))._1 }}
-      nodePort: {{ .Values.scheduler.service.monitorPort }}
+      port: {{ .Values.scheduler.service.monitorPort | default 31993 }}  # Default monitoring port is 31993
+      targetPort: {{ .Values.scheduler.service.monitorTargetPort | default 31993 }}
+      {{- if eq (.Values.scheduler.service.type | default "NodePort") "NodePort" }}  # If type is NodePort, set nodePort
+      nodePort: {{ .Values.scheduler.service.monitorPort | default 31993 }}
+      {{- end }}
       protocol: TCP
   selector:
     app.kubernetes.io/component: hami-scheduler
-    {{- include "hami-vgpu.selectorLabels" . | nindent 4 }}
-
+    {{- include "hami-vgpu.selectorLabels" . | nindent 4 }}

charts/hami/values.yaml

@@ -119,9 +119,10 @@ scheduler:
     tolerations: []
     runAsUser: 2000
   service:
-    httpPort: 443
-    schedulerPort: 31998
-    monitorPort: 31993
+    type: NodePort  # Default type is NodePort, can be changed to ClusterIP
+    httpPort: 443   # HTTP port
+    schedulerPort: 31998  # NodePort for HTTP
+    monitorPort: 31993    # Monitoring port
     labels: {}
     annotations: {}
 
@@ -141,7 +142,10 @@ devicePlugin:
     - -v=4
 
   service:
+    type: NodePort  # Default type is NodePort, can be changed to ClusterIP
     httpPort: 31992
+    labels: {}
+    annotations: {}
 
   pluginPath: /var/lib/kubelet/device-plugins
   libPath: /usr/local/vgpu