kubernetes
/
autoscaler
mirror of https://github.com/kubernetes/autoscaler.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: remove newlines from VPA recommendations 

Signed-off-by: Omer Aplatony <omerap12@gmail.com>
This commit is contained in:
Omer Aplatony 2024-12-06 13:54:05 +02:00
parent 4d092e5f0a
commit 4bb7fb04dc
2 changed files with 46 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
vertical-pod-autoscaler/pkg/updater/priority/update_priority_calculator.go
View File

@ -188,7 +188,6 @@ func (calc *UpdatePriorityCalculator) GetProcessedRecommendationTargets(r *vpa_t
sb.WriteString(fmt.Sprintf("%vm;", cr.UncappedTarget.Cpu().MilliValue()))
}
}
sb.WriteString("\n")
}
return sb.String()
}

49
vertical-pod-autoscaler/pkg/updater/priority/update_priority_calculator_test.go
View File

@ -565,17 +565,60 @@ func TestAddPodLogs(t *testing.T) {
{
name: "container with target and uncappedTarget",
givenRec: test.Recommendation().WithContainer(containerName).WithTarget("4", "10M").Get(),
expectedLog: "container1: target: 10000k 4000m; uncappedTarget: 10000k 4000m;\n",
expectedLog: "container1: target: 10000k 4000m; uncappedTarget: 10000k 4000m;",
},
{
name: "container with cpu only",
givenRec: test.Recommendation().WithContainer(containerName).WithTarget("8", "").Get(),
expectedLog: "container1: target: 8000m; uncappedTarget: 8000m;\n",
expectedLog: "container1: target: 8000m; uncappedTarget: 8000m;",
},
{
name: "container with memory only",
givenRec: test.Recommendation().WithContainer(containerName).WithTarget("", "10M").Get(),
expectedLog: "container1: target: 10000k uncappedTarget: 10000k \n",
expectedLog: "container1: target: 10000k uncappedTarget: 10000k ",
},
{
name: "multi-container with different resources",
givenRec: &vpa_types.RecommendedPodResources{
ContainerRecommendations: []vpa_types.RecommendedContainerResources{
{
ContainerName: "container-1",
Target: test.Resources("4", "10M"),
},
{
ContainerName: "container-2",
Target: test.Resources("8", ""),
},
{
ContainerName: "container-3",
Target: test.Resources("", "10m"),
},
},
},
expectedLog: "container-1: target: 10000k 4000m; container-2: target: 8000m; container-3: target: 1k ",
},
{
name: "multi-containers with uncappedTarget",
givenRec: &vpa_types.RecommendedPodResources{
ContainerRecommendations: []vpa_types.RecommendedContainerResources{
{
ContainerName: "container-1",
Target: test.Resources("4", "10M"),
UncappedTarget: test.Resources("4", "10M"),
},
{
ContainerName: "container-2",
Target: test.Resources("8", ""),
UncappedTarget: test.Resources("8", ""),
},
{
ContainerName: "container-3",
Target: test.Resources("", "10m"),
UncappedTarget: test.Resources("", "10m"),
},
},
},
expectedLog: "container-1: target: 10000k 4000m; uncappedTarget: 10000k 4000m;container-2: target: 8000m; uncappedTarget: 8000m;container-3: target: 1k uncappedTarget: 1k ",
},
}
for _, tc := range testCases {