Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MTV-1493 | Add missing resource limits and requests #1268

Merged
merged 1 commit into from
Dec 13, 2024
Merged

MTV-1493 | Add missing resource limits and requests #1268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions operator/roles/forkliftcontroller/defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,12 +111,26 @@ populator_controller_container_name: "{{ app_name }}-populator-controller"
populator_openstack_image_fqin: "{{ lookup( 'env', 'OPENSTACK_POPULATOR_IMAGE') or lookup( 'env', 'RELATED_IMAGE_OPENSTACK_POPULATOR') }}"

must_gather_image_fqin: "{{ lookup( 'env', 'MUST_GATHER_IMAGE') or lookup( 'env', 'RELATED_IMAGE_MUST_GATHER') }}"

virt_v2v_image_fqin: "{{ lookup( 'env', 'VIRT_V2V_IMAGE') or lookup( 'env', 'RELATED_IMAGE_VIRT_V2V') }}"
virt_v2v_dont_request_kvm: "{{ lookup( 'env', 'VIRT_V2V_DONT_REQUEST_KVM') }}"
virt_v2v_extra_args: "{{ lookup( 'env', 'VIRT_V2V_EXTRA_ARGS') }}"
virt_v2v_extra_conf_config_map: "{{ lookup( 'env', 'VIRT_V2V_EXTRA_CONF_CONFIG_MAP') }}"
virt_v2v_container_limits_cpu: "4000m"
virt_v2v_container_limits_memory: "8Gi"
virt_v2v_container_requests_cpu: "1000m"
virt_v2v_container_requests_memory: "1Gi"

hooks_container_limits_cpu: "1000m"
hooks_container_limits_memory: "1Gi"
hooks_container_requests_cpu: "100m"
hooks_container_requests_memory: "150Mi"

ova_provider_server_fqin: "{{ lookup( 'env', 'OVA_PROVIDER_SERVER_IMAGE') or lookup( 'env', 'RELATED_IMAGE_OVA_PROVIDER_SERVER') }}"
ova_container_limits_cpu: "1000m"
ova_container_limits_memory: "1Gi"
ova_container_requests_cpu: "100m"
ova_container_requests_memory: "150Mi"

metric_service_name: "{{ app_name }}-metrics"
metric_servicemonitor_name: "{{ app_name }}-metrics"
Expand Down
24 changes: 24 additions & 0 deletions operator/roles/forkliftcontroller/templates/controller/deployment-controller.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,30 @@ spec:
value: "{{ virt_v2v_extra_args }}"
- name: VIRT_V2V_EXTRA_CONF_CONFIG_MAP
value: "{{ virt_v2v_extra_conf_config_map }}"
- name: VIRT_V2V_CONTAINER_LIMITS_CPU
value: "{{ virt_v2v_container_limits_cpu }}"
- name: VIRT_V2V_CONTAINER_LIMITS_MEMORY
value: "{{ virt_v2v_container_limits_memory }}"
- name: VIRT_V2V_CONTAINER_REQUESTS_CPU
value: "{{ virt_v2v_container_requests_cpu }}"
- name: VIRT_V2V_CONTAINER_REQUESTS_MEMORY
value: "{{ virt_v2v_container_requests_memory }}"
- name: HOOKS_CONTAINER_LIMITS_CPU
value: "{{ hooks_container_limits_cpu }}"
- name: HOOKS_CONTAINER_LIMITS_MEMORY
value: "{{ hooks_container_limits_memory }}"
- name: HOOKS_CONTAINER_REQUESTS_CPU
value: "{{ hooks_container_requests_cpu }}"
- name: HOOKS_CONTAINER_REQUESTS_MEMORY
value: "{{ hooks_container_requests_memory }}"
- name: OVA_CONTAINER_LIMITS_CPU
value: "{{ ova_container_limits_cpu }}"
- name: OVA_CONTAINER_LIMITS_MEMORY
value: "{{ ova_container_limits_memory }}"
- name: OVA_CONTAINER_REQUESTS_CPU
value: "{{ ova_container_requests_cpu }}"
- name: OVA_CONTAINER_REQUESTS_MEMORY
value: "{{ ova_container_requests_memory }}"
envFrom:
- configMapRef:
name: {{ controller_configmap_name }}
Expand Down
11 changes: 11 additions & 0 deletions pkg/controller/plan/hook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (
"gopkg.in/yaml.v2"
batch "k8s.io/api/batch/v1"
core "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
meta "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/client-go/kubernetes/scheme"
Expand Down Expand Up @@ -181,6 +182,16 @@ func (r *HookRunner) template(mp *core.ConfigMap) (template *core.PodTemplateSpe
{
Name: "hook",
Image: r.hook.Spec.Image,
Resources: core.ResourceRequirements{
Requests: core.ResourceList{
core.ResourceCPU: resource.MustParse(Settings.Migration.HooksContainerRequestsCpu),
core.ResourceMemory: resource.MustParse(Settings.Migration.HooksContainerRequestsMemory),
},
Limits: core.ResourceList{
core.ResourceCPU: resource.MustParse(Settings.Migration.HooksContainerLimitsCpu),
core.ResourceMemory: resource.MustParse(Settings.Migration.HooksContainerLimitsMemory),
},
},
VolumeMounts: []core.VolumeMount{
{
Name: "hook",
Expand Down
30 changes: 30 additions & 0 deletions pkg/controller/plan/kubevirt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -773,6 +773,16 @@ func (r *KubeVirt) createPodToBindPVCs(vm *plan.VMStatus, pvcNames []string) (er
// In that case, we could benefit from pulling the image of the conversion pod, so it will be present on the node.
Image: Settings.Migration.VirtV2vImage,
Command: []string{"/bin/sh"},
Resources: core.ResourceRequirements{
Requests: core.ResourceList{
core.ResourceCPU: resource.MustParse(Settings.Migration.VirtV2vContainerRequestsCpu),
core.ResourceMemory: resource.MustParse(Settings.Migration.VirtV2vContainerRequestsMemory),
},
Limits: core.ResourceList{
core.ResourceCPU: resource.MustParse(Settings.Migration.VirtV2vContainerLimitsCpu),
core.ResourceMemory: resource.MustParse(Settings.Migration.VirtV2vContainerLimitsMemory),
},
},
SecurityContext: &core.SecurityContext{
AllowPrivilegeEscalation: &allowPrivilageEscalation,
RunAsNonRoot: &nonRoot,
Expand Down Expand Up @@ -1738,6 +1748,16 @@ func (r *KubeVirt) guestConversionPod(vm *plan.VMStatus, vmVolumes []cnv.Volume,
MountPath: "/opt",
},
},
Resources: core.ResourceRequirements{
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Init container only for mount, don't think we need it to be configurable.

Requests: core.ResourceList{
core.ResourceCPU: resource.MustParse("100m"),
core.ResourceMemory: resource.MustParse("150Mi"),
},
Limits: core.ResourceList{
core.ResourceCPU: resource.MustParse("1000m"),
core.ResourceMemory: resource.MustParse("500Mi"),
},
},
SecurityContext: &core.SecurityContext{
AllowPrivilegeEscalation: &allowPrivilageEscalation,
Capabilities: &core.Capabilities{
Expand Down Expand Up @@ -1823,6 +1843,16 @@ func (r *KubeVirt) guestConversionPod(vm *plan.VMStatus, vmVolumes []cnv.Volume,
Name: "virt-v2v",
Env: environment,
ImagePullPolicy: core.PullAlways,
Resources: core.ResourceRequirements{
Requests: core.ResourceList{
core.ResourceCPU: resource.MustParse(Settings.Migration.VirtV2vContainerRequestsCpu),
core.ResourceMemory: resource.MustParse(Settings.Migration.VirtV2vContainerRequestsMemory),
},
Limits: core.ResourceList{
core.ResourceCPU: resource.MustParse(Settings.Migration.VirtV2vContainerLimitsCpu),
core.ResourceMemory: resource.MustParse(Settings.Migration.VirtV2vContainerLimitsMemory),
},
},
EnvFrom: []core.EnvFromSource{
{
Prefix: "V2V_",
Expand Down
23 changes: 22 additions & 1 deletion pkg/controller/plan/validation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
core "k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
k8serr "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/resource"
meta "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
k8svalidation "k8s.io/apimachinery/pkg/util/validation"
Expand Down Expand Up @@ -1016,6 +1017,16 @@ func createVddkCheckJob(plan *api.Plan) *batchv1.Job {
Drop: []core.Capability{"ALL"},
},
},
Resources: core.ResourceRequirements{
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Init container only for mount, don't think we need it to be configurable.

Requests: core.ResourceList{
core.ResourceCPU: resource.MustParse("100m"),
core.ResourceMemory: resource.MustParse("150Mi"),
},
Limits: core.ResourceList{
core.ResourceCPU: resource.MustParse("1000m"),
core.ResourceMemory: resource.MustParse("500Mi"),
},
},
},
}

Expand Down Expand Up @@ -1057,7 +1068,17 @@ func createVddkCheckJob(plan *api.Plan) *batchv1.Job {
InitContainers: initContainers,
Containers: []core.Container{
{
Name: "validator",
Name: "validator",
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Validation contianer only for mount, don't think we need it to be configurable.

Resources: core.ResourceRequirements{
Requests: core.ResourceList{
core.ResourceCPU: resource.MustParse("100m"),
core.ResourceMemory: resource.MustParse("150Mi"),
},
Limits: core.ResourceList{
core.ResourceCPU: resource.MustParse("1000m"),
core.ResourceMemory: resource.MustParse("500Mi"),
},
},
Image: Settings.Migration.VirtV2vImage,
SecurityContext: &core.SecurityContext{
AllowPrivilegeEscalation: ptr.To(false),
Expand Down
10 changes: 10 additions & 0 deletions pkg/controller/provider/ova-setup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,16 @@ func (r *Reconciler) makeOvaProviderPodSpec(pvcName, providerName, providerNames
MountPath: mountPath,
},
},
Resources: core.ResourceRequirements{
Requests: core.ResourceList{
core.ResourceCPU: resource.MustParse(Settings.OvaContainerRequestsCpu),
core.ResourceMemory: resource.MustParse(Settings.OvaContainerRequestsMemory),
},
Limits: core.ResourceList{
core.ResourceCPU: resource.MustParse(Settings.OvaContainerLimitsCpu),
core.ResourceMemory: resource.MustParse(Settings.OvaContainerRequestsMemory),
},
},
SecurityContext: securityContext,
}

Expand Down
127 changes: 106 additions & 21 deletions pkg/settings/migration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,26 +12,38 @@ import (

// Environment variables.
const (
MaxVmInFlight = "MAX_VM_INFLIGHT"
HookRetry = "HOOK_RETRY"
ImporterRetry = "IMPORTER_RETRY"
VirtV2vImage = "VIRT_V2V_IMAGE"
PrecopyInterval = "PRECOPY_INTERVAL"
VirtV2vDontRequestKVM = "VIRT_V2V_DONT_REQUEST_KVM"
SnapshotRemovalTimeout = "SNAPSHOT_REMOVAL_TIMEOUT"
SnapshotStatusCheckRate = "SNAPSHOT_STATUS_CHECK_RATE"
CDIExportTokenTTL = "CDI_EXPORT_TOKEN_TTL"
FileSystemOverhead = "FILESYSTEM_OVERHEAD"
BlockOverhead = "BLOCK_OVERHEAD"
CleanupRetries = "CLEANUP_RETRIES"
DvStatusCheckRetries = "DV_STATUS_CHECK_RETRIES"
SnapshotRemovalCheckRetries = "SNAPSHOT_REMOVAL_CHECK_RETRIES"
OvirtOsConfigMap = "OVIRT_OS_MAP"
VsphereOsConfigMap = "VSPHERE_OS_MAP"
VirtCustomizeConfigMap = "VIRT_CUSTOMIZE_MAP"
VddkJobActiveDeadline = "VDDK_JOB_ACTIVE_DEADLINE"
VirtV2vExtraArgs = "VIRT_V2V_EXTRA_ARGS"
VirtV2vExtraConfConfigMap = "VIRT_V2V_EXTRA_CONF_CONFIG_MAP"
MaxVmInFlight = "MAX_VM_INFLIGHT"
HookRetry = "HOOK_RETRY"
ImporterRetry = "IMPORTER_RETRY"
VirtV2vImage = "VIRT_V2V_IMAGE"
PrecopyInterval = "PRECOPY_INTERVAL"
VirtV2vDontRequestKVM = "VIRT_V2V_DONT_REQUEST_KVM"
SnapshotRemovalTimeout = "SNAPSHOT_REMOVAL_TIMEOUT"
SnapshotStatusCheckRate = "SNAPSHOT_STATUS_CHECK_RATE"
CDIExportTokenTTL = "CDI_EXPORT_TOKEN_TTL"
FileSystemOverhead = "FILESYSTEM_OVERHEAD"
BlockOverhead = "BLOCK_OVERHEAD"
CleanupRetries = "CLEANUP_RETRIES"
DvStatusCheckRetries = "DV_STATUS_CHECK_RETRIES"
SnapshotRemovalCheckRetries = "SNAPSHOT_REMOVAL_CHECK_RETRIES"
OvirtOsConfigMap = "OVIRT_OS_MAP"
VsphereOsConfigMap = "VSPHERE_OS_MAP"
VirtCustomizeConfigMap = "VIRT_CUSTOMIZE_MAP"
VddkJobActiveDeadline = "VDDK_JOB_ACTIVE_DEADLINE"
VirtV2vExtraArgs = "VIRT_V2V_EXTRA_ARGS"
VirtV2vExtraConfConfigMap = "VIRT_V2V_EXTRA_CONF_CONFIG_MAP"
VirtV2vContainerLimitsCpu = "VIRT_V2V_CONTAINER_LIMITS_CPU"
VirtV2vContainerLimitsMemory = "VIRT_V2V_CONTAINER_LIMITS_MEMORY"
VirtV2vContainerRequestsCpu = "VIRT_V2V_CONTAINER_REQUESTS_CPU"
VirtV2vContainerRequestsMemory = "VIRT_V2V_CONTAINER_REQUESTS_MEMORY"
HooksContainerLimitsCpu = "HOOKS_CONTAINER_LIMITS_CPU"
HooksContainerLimitsMemory = "HOOKS_CONTAINER_LIMITS_MEMORY"
HooksContainerRequestsCpu = "HOOKS_CONTAINER_REQUESTS_CPU"
HooksContainerRequestsMemory = "HOOKS_CONTAINER_REQUESTS_MEMORY"
OvaContainerLimitsCpu = "OVA_CONTAINER_LIMITS_CPU"
OvaContainerLimitsMemory = "OVA_CONTAINER_LIMITS_MEMORY"
OvaContainerRequestsCpu = "OVA_CONTAINER_REQUESTS_CPU"
OvaContainerRequestsMemory = "OVA_CONTAINER_REQUESTS_MEMORY"
)

// Migration settings
Expand Down Expand Up @@ -75,7 +87,19 @@ type Migration struct {
// Additional arguments for virt-v2v
VirtV2vExtraArgs string
// Additional configuration for virt-v2v
VirtV2vExtraConfConfigMap string
VirtV2vExtraConfConfigMap string
VirtV2vContainerLimitsCpu string
VirtV2vContainerLimitsMemory string
VirtV2vContainerRequestsCpu string
VirtV2vContainerRequestsMemory string
HooksContainerLimitsCpu string
HooksContainerLimitsMemory string
HooksContainerRequestsCpu string
HooksContainerRequestsMemory string
OvaContainerLimitsCpu string
OvaContainerLimitsMemory string
OvaContainerRequestsCpu string
OvaContainerRequestsMemory string
}

// Load settings.
Expand Down Expand Up @@ -157,5 +181,66 @@ func (r *Migration) Load() (err error) {
if val, found := os.LookupEnv(VirtV2vExtraConfConfigMap); found {
r.VirtV2vExtraConfConfigMap = val
}
// Containers configurations
if val, found := os.LookupEnv(VirtV2vContainerLimitsCpu); found {
r.VirtV2vContainerLimitsCpu = val
} else {
r.VirtV2vContainerLimitsCpu = "4000m"
}
if val, found := os.LookupEnv(VirtV2vContainerLimitsMemory); found {
r.VirtV2vContainerLimitsMemory = val
} else {
r.VirtV2vContainerLimitsMemory = "8Gi"
}
if val, found := os.LookupEnv(VirtV2vContainerRequestsCpu); found {
r.VirtV2vContainerRequestsCpu = val
} else {
r.VirtV2vContainerRequestsCpu = "1000m"
}
if val, found := os.LookupEnv(VirtV2vContainerRequestsMemory); found {
r.VirtV2vContainerRequestsMemory = val
} else {
r.VirtV2vContainerRequestsMemory = "1Gi"
}
if val, found := os.LookupEnv(HooksContainerLimitsCpu); found {
r.HooksContainerLimitsCpu = val
} else {
r.HooksContainerLimitsCpu = "1000m"
}
if val, found := os.LookupEnv(HooksContainerLimitsMemory); found {
r.HooksContainerLimitsMemory = val
} else {
r.HooksContainerLimitsMemory = "1Gi"
}
if val, found := os.LookupEnv(HooksContainerRequestsCpu); found {
r.HooksContainerRequestsCpu = val
} else {
r.HooksContainerRequestsCpu = "100m"
}
if val, found := os.LookupEnv(HooksContainerRequestsMemory); found {
r.HooksContainerRequestsMemory = val
} else {
r.HooksContainerRequestsMemory = "150Mi"
}
if val, found := os.LookupEnv(OvaContainerLimitsCpu); found {
r.OvaContainerLimitsCpu = val
} else {
r.OvaContainerLimitsCpu = "1000m"
}
if val, found := os.LookupEnv(OvaContainerLimitsMemory); found {
r.OvaContainerLimitsMemory = val
} else {
r.OvaContainerLimitsMemory = "1Gi"
}
if val, found := os.LookupEnv(OvaContainerRequestsCpu); found {
r.OvaContainerRequestsCpu = val
} else {
r.OvaContainerRequestsCpu = "100m"
}
if val, found := os.LookupEnv(OvaContainerRequestsMemory); found {
r.OvaContainerRequestsMemory = val
} else {
r.OvaContainerRequestsMemory = "150Mi"
}
return
}
Loading