Skip to content

Commit 448ee53

Browse files
committed
Cosmetic fixes
Rever memory overhead of `kata` to 350 megs. Commit text example : The pod overhead of peer pods is expected to be lower than regular kata pods. Use a different set of values for the `kata` and `kata-remote` runtime classe, like upstream kata does. Current numbers for `kata` are kept. New numbers for `kata-remote` are taken from upstream.The numbers can probably be refined some more through experiments. Signed-off-by: Greg Kurz <[email protected]>
1 parent 40322ec commit 448ee53

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

controllers/openshift_controller.go

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,15 +78,15 @@ const (
7878
peerpodsCrioMachineConfigYaml = "mc-50-crio-config.yaml"
7979
peerpodsKataRemoteMachineConfig = "40-worker-kata-remote-config"
8080
peerpodsKataRemoteMachineConfigYaml = "mc-40-kata-remote-config.yaml"
81-
kataRuntimeClassName = "kata"
82-
kataRuntimeClassCpuOverhead = "0.25"
83-
kataRuntimeClassMemOverhead = "160Mi"
84-
peerpodsRuntimeClassName = "kata-remote"
85-
peerpodsRuntimeClassCpuOverhead = "0.25"
86-
peerpodsRuntimeClassMemOverhead = "120Mi"
8781
// Use same Pod Overhead as upstream kata-deploy using, see
8882
// https://github.com/kata-containers/kata-containers/blob/main/tools/packaging/kata-deploy/runtimeclasses/kata-qemu.yaml#L7
83+
kataRuntimeClassName = "kata"
84+
kataRuntimeClassCpuOverhead = "0.25"
85+
kataRuntimeClassMemOverhead = "350Mi"
8986
// https://github.com/kata-containers/kata-containers/blob/main/tools/packaging/kata-deploy/runtimeclasses/kata-remote.yaml#L7
87+
peerpodsRuntimeClassName = "kata-remote"
88+
peerpodsRuntimeClassCpuOverhead = "0.25"
89+
peerpodsRuntimeClassMemOverhead = "120Mi"
9090
)
9191

9292
// +kubebuilder:rbac:groups=kataconfiguration.openshift.io,resources=kataconfigs;kataconfigs/finalizers,verbs=get;list;watch;create;update;patch;delete
@@ -702,7 +702,6 @@ func (r *KataConfigOpenShiftReconciler) createRuntimeClass(runtimeClassName stri
702702
Name: runtimeClassName,
703703
},
704704
Handler: runtimeClassName,
705-
706705
Overhead: &nodeapi.Overhead{
707706
PodFixed: corev1.ResourceList{
708707
corev1.ResourceCPU: resource.MustParse(cpuOverhead),

0 commit comments

Comments
 (0)