fix

Signed-off-by: Yaroslav Borbat <yaroslav.borbat@flant.com>

Author: yaroslavborbat

openapi/config-values.yaml

@@ -268,3 +268,78 @@ properties:
         description: |
           Enable or disable the descheduler. Set to true to activate VM eviction.
         x-examples: [true, false]
+      lowNodeUtilization:
+        type: object
+        default: {}
+        properties:
+          enabled:
+            type: boolean
+          thresholds:
+            type: object
+            default: {}
+            properties:
+              cpu:
+                type: integer
+                minimal: 0
+                maximal: 100
+                description: CPU fraction in percents
+              memory:
+                type: integer
+                minimal: 0
+                maximal: 100
+                description: Memory fraction in percents
+              pods:
+                type: integer
+                minimal: 0
+                maximal: 100
+                description: Pods count in percents
+            additionalProperties: true
+          targetThresholds:
+            type: object
+            default: {}
+            properties:
+              cpu:
+                type: integer
+                minimal: 0
+                maximal: 100
+                description: CPU fraction in percents
+              memory:
+                type: integer
+                minimal: 0
+                maximal: 100
+                description: Memory fraction in percents
+              pods:
+                type: integer
+                minimal: 0
+                maximal: 100
+                description: Pods count in percents
+            additionalProperties: true
+      highNodeUtilization:
+        type: object
+        default: {}
+        properties:
+          enabled:
+            type: boolean
+          thresholds:
+            type: object
+            default: {}
+            properties:
+              cpu:
+                type: integer
+                minimal: 0
+                maximal: 100
+                description: CPU fraction in percents
+              memory:
+                type: integer
+                minimal: 0
+                maximal: 100
+                description: Memory fraction in percents
+              pods:
+                type: integer
+                minimal: 0
+                maximal: 100
+                description: Pods count in percents
+            additionalProperties: true
+    anyOf:
+      - required: ["lowNodeUtilization"]
+      - required: ["highNodeUtilization"]

templates/descheduler/descheduler.yaml

@@ -1,3 +1,4 @@
+{{- if .Values.virtualization.descheduler.enabled }}
 apiVersion: deckhouse.io/v1alpha2
 kind: Descheduler
 metadata:
@@ -9,15 +10,29 @@ spec:
       - key: vm.kubevirt.internal.virtualization.deckhouse.io/name
         operator: Exists
   strategies:
+    {{- if .Values.virtualization.descheduler.highNodeUtilization.enabled }}
     highNodeUtilization:
       enabled: true
       thresholds:
-        cpu: 20
-        memory: 80
-        pods: 20
+        cpu: {{ .Values.virtualization.descheduler.highNodeUtilization.thresholds.cpu | default 20 }}
+        memory: {{ .Values.virtualization.descheduler.highNodeUtilization.thresholds.memory | default 80 }}
+        pods: {{ .Values.virtualization.descheduler.highNodeUtilization.thresholds.pods | default 20 }}
+    {{- else if .Values.virtualization.descheduler.lowNodeUtilization.enabled }}
+    lowNodeUtilization:
+      enabled: true
+      thresholds:
+        cpu: {{ .Values.virtualization.descheduler.lowNodeUtilization.thresholds.cpu | default 20 }}
+        memory: {{ .Values.virtualization.descheduler.lowNodeUtilization.thresholds.memory | default 80 }}
+        pods: {{ .Values.virtualization.descheduler.lowNodeUtilization.thresholds.pods | default 20 }}
+      targetThresholds:
+        cpu: {{ .Values.virtualization.descheduler.lowNodeUtilization.targetThresholds.cpu | default 50 }}
+        memory: {{ .Values.virtualization.descheduler.lowNodeUtilization.targetThresholds.memory | default 50 }}
+        pods: {{ .Values.virtualization.descheduler.lowNodeUtilization.targetThresholds.pods | default 50 }}
+    {{- end }}
     removePodsViolatingInterPodAntiAffinity:
       enabled: true
     removePodsViolatingNodeAffinity:
       enabled: true
       nodeAffinityType:
         - requiredDuringSchedulingIgnoredDuringExecution
+{{- end }}