From edccdbd7c2f5fb746d69e21001b4fc219f2d4d46 Mon Sep 17 00:00:00 2001 From: Krisztian Litkey Date: Tue, 28 Jul 2026 13:35:00 +0300 Subject: [PATCH 1/3] e2e: accept/fix v-prefixed k8s, containerd and crio releases. Signed-off-by: Krisztian Litkey --- test/e2e/run.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/e2e/run.sh b/test/e2e/run.sh index cbe4e3ce3..cddb21c18 100755 --- a/test/e2e/run.sh +++ b/test/e2e/run.sh @@ -47,6 +47,7 @@ TOPOLOGY_DIR=${TOPOLOGY_DIR:=e2e} GH_K8S_REPO="kubernetes/kubernetes" export k8s_release=${k8s_release:-"latest"} +k8s_release="${k8s_release#v}" export k8s_version="" GH_HELM_REPO="helm/helm" @@ -180,6 +181,7 @@ fi # a compiled version of containerd which we should install. GH_CONTAINERD_REPO="containerd/containerd" export containerd_release=${containerd_release:-latest} +containerd_release="${containerd_release#v}" if [ "$k8scri" = "containerd" -a "$containerd_release" = "latest" ]; then if latest_containerd_release=$(vm-load-cached-var "$OUTPUT_DIR" latest_containerd_release); then @@ -205,6 +207,7 @@ export containerd_src=${containerd_src:-} # a compiled version of CRI-O which we should install. GH_CRIO_REPO="cri-o/cri-o" export crio_release=${crio_release:-latest} +crio_release="${crio_release#v}" export crio_src=${crio_src:-} if [ "$k8scri" = "crio" -a "$crio_release" = "latest" ]; then From c8cc28f3ca7b7f022b68eb875557ff1d8d74e842 Mon Sep 17 00:00:00 2001 From: Krisztian Litkey Date: Tue, 28 Jul 2026 13:24:00 +0300 Subject: [PATCH 2/3] e2e: update fedora image locations. Signed-off-by: Krisztian Litkey --- test/e2e/run.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/e2e/run.sh b/test/e2e/run.sh index cddb21c18..4e015e593 100755 --- a/test/e2e/run.sh +++ b/test/e2e/run.sh @@ -13,9 +13,10 @@ if [ -z "${!distro_images[*]}" ]; then declare -A distro_images=( ["generic/ubuntu2204"]="" ["fedora/40"]="https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/40/Cloud/x86_64/images/Fedora-Cloud-Base-Vagrant-libvirt.x86_64-40-1.14.vagrant.libvirt.box" - ["fedora/41"]="https://dl.fedoraproject.org/pub/fedora/linux/releases/41/Cloud/x86_64/images/Fedora-Cloud-Base-Vagrant-libvirt-41-1.4.x86_64.vagrant.libvirt.box" - ["fedora/42"]="https://dl.fedoraproject.org/pub/fedora/linux/releases/42/Cloud/x86_64/images/Fedora-Cloud-Base-Vagrant-libvirt-42-1.1.x86_64.vagrant.libvirt.box" + ["fedora/41"]="https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/41/Cloud/x86_64/images/Fedora-Cloud-Base-Vagrant-libvirt-41-1.4.x86_64.vagrant.libvirt.box" + ["fedora/42"]="https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/42/Cloud/x86_64/images/Fedora-Cloud-Base-Vagrant-libvirt-42-1.1.x86_64.vagrant.libvirt.box" ["fedora/43"]="https://dl.fedoraproject.org/pub/fedora/linux/releases/43/Cloud/x86_64/images/Fedora-Cloud-Base-Vagrant-libvirt-43-1.6.x86_64.vagrant.libvirt.box" + ["fedora/44"]="https://dl.fedoraproject.org/pub/fedora/linux/releases/44/Cloud/x86_64/images/Fedora-Cloud-Base-Vagrant-libvirt-44-1.7.x86_64.vagrant.libvirt.box" ) else echo "WARNING: using overridden distro images" From f38d6583d0eefbfa0d41471b8d82fe1b057aac7b Mon Sep 17 00:00:00 2001 From: Krisztian Litkey Date: Wed, 29 Jul 2026 12:45:35 +0300 Subject: [PATCH 3/3] spelling: s/unusded/unused/ in a comment. Signed-off-by: Krisztian Litkey --- config/crd/bases/config.nri_balloonspolicies.yaml | 2 +- deployment/helm/balloons/crds/config.nri_balloonspolicies.yaml | 2 +- pkg/apis/config/v1alpha1/resmgr/policy/balloons/config.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/crd/bases/config.nri_balloonspolicies.yaml b/config/crd/bases/config.nri_balloonspolicies.yaml index 545c73cd2..011760141 100644 --- a/config/crd/bases/config.nri_balloonspolicies.yaml +++ b/config/crd/bases/config.nri_balloonspolicies.yaml @@ -856,7 +856,7 @@ spec: type: array idleCPUClass: description: |- - IdleCpuClass controls how unusded CPUs outside any a + IdleCpuClass controls how unused CPUs outside any a balloons are (re)configured. type: string instrumentation: diff --git a/deployment/helm/balloons/crds/config.nri_balloonspolicies.yaml b/deployment/helm/balloons/crds/config.nri_balloonspolicies.yaml index 545c73cd2..011760141 100644 --- a/deployment/helm/balloons/crds/config.nri_balloonspolicies.yaml +++ b/deployment/helm/balloons/crds/config.nri_balloonspolicies.yaml @@ -856,7 +856,7 @@ spec: type: array idleCPUClass: description: |- - IdleCpuClass controls how unusded CPUs outside any a + IdleCpuClass controls how unused CPUs outside any a balloons are (re)configured. type: string instrumentation: diff --git a/pkg/apis/config/v1alpha1/resmgr/policy/balloons/config.go b/pkg/apis/config/v1alpha1/resmgr/policy/balloons/config.go index a8d6230d6..4b3eec2c0 100644 --- a/pkg/apis/config/v1alpha1/resmgr/policy/balloons/config.go +++ b/pkg/apis/config/v1alpha1/resmgr/policy/balloons/config.go @@ -85,7 +85,7 @@ type Config struct { // PinMemory controls pinning containers to memory nodes. // +kubebuilder:default=true PinMemory *bool `json:"pinMemory,omitempty"` - // IdleCpuClass controls how unusded CPUs outside any a + // IdleCpuClass controls how unused CPUs outside any a // balloons are (re)configured. IdleCpuClass string `json:"idleCPUClass,omitempty"` // ReservedPoolNamespaces is a list of namespace globs that