Merge pull request #3740 from lekaf974/feat/kubestatemetrics-remove-h…

…aedcoded-nodeselector

Remove hardcoded nodeSelector for kubestatematrics

installer/README.md

@@ -116,6 +116,7 @@ The following are the list configurable parameters of Volcano Chart and their de
 |`custom.admission_ns`|nodeSelector for Admission pods|`~`|
 |`custom.controller_ns`|nodeSelector for Controller pods|`~`|
 |`custom.scheduler_ns`|nodeSelector for Scheduler pods|`~`|
+|`custom.kube_state_metrics_ns`|nodeSelector for Kube State Metrics pods|`~`|
 |`custom.admission_podLabels`|Pod labels for Admission pods|`~`|
 |`custom.controller_podLabels`|Pod labels for Controller pods|`~`|
 |`custom.scheduler_podLabels`|Pod labels for Scheduler pods|`~`|

installer/helm/chart/volcano/templates/kubestatemetrics.yaml

@@ -1,4 +1,5 @@
 {{- if .Values.custom.metrics_enable }}
+{{ $kube_state_metrics_ns := or .Values.custom.kube_state_metrics_ns .Values.custom.default_ns }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
@@ -184,9 +185,8 @@ spec:
             initialDelaySeconds: 5
             timeoutSeconds: 5
       dnsPolicy: ClusterFirst
-      {{ if .Values.custom.metrics_enable }}
-      nodeSelector:
-        node.kubernetes.io/instance-type: controlpanel
+      {{ if $kube_state_metrics_ns }}
+      nodeSelector: {{- toYaml $kube_state_metrics_ns | nindent 8 }}
       {{ end }}
       serviceAccountName: kube-state-metrics
 ---

installer/helm/chart/volcano/values.yaml

@@ -92,7 +92,7 @@ custom:
   admission_ns: ~
   scheduler_ns: ~
   controller_ns: ~
-
+  kube_state_metrics_ns: ~
 
 # Specify labels for Volcano main component deployments and pods
 # For example: