kubevirt: add support for affinity and resources

Author: HoKim98

charts/kubevirt/0.4.0/templates/kubevirt.yaml

@@ -20,6 +20,10 @@ spec:
   {{- if .Values.kubevirt.uninstallStrategy }}
   uninstallStrategy: {{ .Values.kubevirt.uninstallStrategy }}
   {{- end }}
+  {{- with .Values.kubevirt.workloads }}
+  workloads:
+  {{- toYaml . | nindent 4 }}
+  {{- end }}
   {{- with .Values.kubevirt.workloadUpdateStrategy }}
   workloadUpdateStrategy:
   {{- toYaml . | nindent 4 }}

charts/kubevirt/0.4.0/values.yaml

@@ -14,6 +14,8 @@ kubevirt:
   # Specifies if KubeVirt can be deleted if workloads are still present.
   # This is mainly a precaution to avoid accidental data loss.
   uninstallStrategy: ""
+  # Selectors and tolerations that should apply to KubeVirt workloads.
+  workloads: {}
   # WorkloadUpdateStrategy defines at the cluster level how to handle automated workload updates.
   workloadUpdateStrategy: {}
   # Optionally enable ServiceMonitor for prometheus, see

packages/cdi/charts/templates/cdi-operator.yaml

@@ -606,17 +606,7 @@ spec:
         prometheus.cdi.kubevirt.io: "true"
     spec:
       affinity:
-        podAffinity:
-          preferredDuringSchedulingIgnoredDuringExecution:
-            - podAffinityTerm:
-                labelSelector:
-                  matchExpressions:
-                    - key: cdi.kubevirt.io
-                      operator: In
-                      values:
-                        - cdi-operator
-                topologyKey: kubernetes.io/hostname
-              weight: 1
+{{- .Values.deployment.affinity | toYaml | nindent 8 }}
       containers:
         - env:
             - name: DEPLOY_CLUSTER_RESOURCES
@@ -650,9 +640,7 @@ spec:
               name: metrics
               protocol: TCP
           resources:
-            requests:
-              cpu: 100m
-              memory: 150Mi
+{{- .Values.deployment.resources | toYaml | nindent 12 }}
           securityContext:
             allowPrivilegeEscalation: false
             capabilities:

packages/cdi/charts/templates/cdi.yaml

@@ -1,3 +1,4 @@
+{{- if ( .Values.cdi.enabled | ne false ) }}
 apiVersion: cdi.kubevirt.io/v1beta1
 kind: CDI
 metadata:
@@ -19,3 +20,4 @@ spec:
   workload:
   {{- toYaml . | nindent 4 }}
   {{- end }}
+{{- end }}

packages/cdi/charts/values.yaml

@@ -8,8 +8,25 @@ deployment:
   uploadserverImage: registry.suse.com/suse/sles/15.6/cdi-uploadserver
   uploadproxyImage: registry.suse.com/suse/sles/15.6/cdi-uploadproxy
   pullPolicy: IfNotPresent
+  affinity:
+    podAntiAffinity:
+      preferredDuringSchedulingIgnoredDuringExecution:
+        - podAffinityTerm:
+            labelSelector:
+              matchExpressions:
+                - key: cdi.kubevirt.io
+                  operator: In
+                  values:
+                    - cdi-operator
+            topologyKey: kubernetes.io/hostname
+          weight: 1
+  resources:
+    requests:
+      cpu: 100m
+      memory: 150Mi
 
 cdi:
+  enabled: true
   config:
     featureGates:
       - HonorWaitForFirstConsumer

packages/kubevirt/charts/templates/kubevirt-operator.yaml

@@ -1279,17 +1279,7 @@ spec:
       name: virt-operator
     spec:
       affinity:
-        podAntiAffinity:
-          preferredDuringSchedulingIgnoredDuringExecution:
-            - podAffinityTerm:
-                labelSelector:
-                  matchExpressions:
-                    - key: kubevirt.io
-                      operator: In
-                      values:
-                        - virt-operator
-                topologyKey: kubernetes.io/hostname
-              weight: 1
+{{- .Values.operator.affinity | toYaml | nindent 8 }}
       containers:
         - args:
             - --port
@@ -1325,9 +1315,7 @@ spec:
             initialDelaySeconds: 5
             timeoutSeconds: 10
           resources:
-            requests:
-              cpu: 10m
-              memory: 450Mi
+{{- .Values.operator.resources | toYaml | nindent 12 }}
           securityContext:
             allowPrivilegeEscalation: false
             capabilities:

packages/kubevirt/charts/templates/kubevirt.yaml

@@ -1,3 +1,4 @@
+{{- if ( .Values.kubevirt.enabled | ne false ) }}
 apiVersion: kubevirt.io/v1
 kind: KubeVirt
 metadata:
@@ -30,3 +31,4 @@ spec:
   {{- if .Values.kubevirt.monitorAccount }}
   monitorAccount: {{ .Values.kubevirt.monitorAccount }}
   {{- end }}
+{{- end }}

packages/kubevirt/charts/values.yaml

@@ -2,8 +2,25 @@ operator:
   image: registry.suse.com/suse/sles/15.6/virt-operator
   version: 1.3.1-150600.5.9.1
   pullPolicy: IfNotPresent
+  affinity:
+    podAntiAffinity:
+      preferredDuringSchedulingIgnoredDuringExecution:
+        - podAffinityTerm:
+            labelSelector:
+              matchExpressions:
+                - key: kubevirt.io
+                  operator: In
+                  values:
+                    - virt-operator
+            topologyKey: kubernetes.io/hostname
+          weight: 1
+  resources:
+    requests:
+      cpu: 10m
+      memory: 450Mi
 
 kubevirt:
+  enabled: true
   # Holds kubevirt configurations. Same as the virt-configMap.
   configuration: {}
   customizeComponents: {}