Skip to content

Commit

Permalink
Fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@jiangpengcheng
jiangpengcheng committed May 6, 2024
1 parent a516c48 commit 4b3a364
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 19 deletions.
2 changes: 1 addition & 1 deletion api/compute/v1alpha1/common.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -568,7 +568,7 @@ type VPASpec struct {

type ResourceUnit struct {
// The CPU request for the pod
Cpu resource.Quantity `json:"cpu,omitempty"`
CPU resource.Quantity `json:"cpu,omitempty"`

// The memory request for the pod
Memory resource.Quantity `json:"memory,omitempty"`
Expand Down
3 changes: 1 addition & 2 deletions api/compute/v1alpha1/zz_generated.deepcopy.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions controllers/common.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,15 +141,15 @@ func observeVPA(ctx context.Context, r client.Reader, name types.NamespacedName,

func calculateVPARecommendation(vpa *vpav1.VerticalPodAutoscaler, vpaSpec *v1alpha1.VPASpec) *corev1.ResourceRequirements {
var multiple int64 = 0
if vpaSpec.ResourceUnit == nil || vpaSpec.ResourceUnit.Cpu.MilliValue() == 0 && vpaSpec.ResourceUnit.Memory.MilliValue() == 0 {
if vpaSpec.ResourceUnit == nil || vpaSpec.ResourceUnit.CPU.MilliValue() == 0 && vpaSpec.ResourceUnit.Memory.MilliValue() == 0 {
return nil
}
if vpa.Status.Recommendation != nil && vpa.Status.Recommendation.ContainerRecommendations != nil {
for _, recommend := range vpa.Status.Recommendation.ContainerRecommendations {
// set resource based on CPU
if recommend.Target.Cpu() != nil && recommend.Target.Cpu().Value() != 0 {
multiple = recommend.Target.Cpu().MilliValue() / vpaSpec.ResourceUnit.Cpu.MilliValue()
if recommend.Target.Cpu().MilliValue()%vpaSpec.ResourceUnit.Cpu.MilliValue() != 0 {
multiple = recommend.Target.Cpu().MilliValue() / vpaSpec.ResourceUnit.CPU.MilliValue()
if recommend.Target.Cpu().MilliValue()%vpaSpec.ResourceUnit.CPU.MilliValue() != 0 {
multiple += 1
}
} else if recommend.Target.Memory() != nil { // set resources based on Memory
Expand All @@ -164,26 +164,26 @@ func calculateVPARecommendation(vpa *vpav1.VerticalPodAutoscaler, vpaSpec *v1alp
if multiple == 0 {
return nil
}
targetCpu := *resource.NewScaledQuantity(multiple*vpaSpec.ResourceUnit.Cpu.MilliValue(), resource.Milli)
targetCPU := *resource.NewScaledQuantity(multiple*vpaSpec.ResourceUnit.CPU.MilliValue(), resource.Milli)
targetMemory := *resource.NewScaledQuantity(multiple*vpaSpec.ResourceUnit.Memory.MilliValue(), resource.Milli)

if vpa.Spec.ResourcePolicy == nil || len(vpa.Spec.ResourcePolicy.ContainerPolicies) == 0 ||
vpa.Spec.ResourcePolicy.ContainerPolicies[0].ControlledValues == nil ||
*vpa.Spec.ResourcePolicy.ContainerPolicies[0].ControlledValues == vpav1.ContainerControlledValuesRequestsAndLimits {
return &corev1.ResourceRequirements{
Limits: corev1.ResourceList{
corev1.ResourceCPU: targetCpu,
corev1.ResourceCPU: targetCPU,
corev1.ResourceMemory: targetMemory,
},
Requests: corev1.ResourceList{
corev1.ResourceCPU: targetCpu,
corev1.ResourceCPU: targetCPU,
corev1.ResourceMemory: targetMemory,
},
}
} else {
return &corev1.ResourceRequirements{
Requests: corev1.ResourceList{
corev1.ResourceCPU: targetCpu,
corev1.ResourceCPU: targetCPU,
corev1.ResourceMemory: targetMemory,
},
}
Expand Down
18 changes: 9 additions & 9 deletions controllers/common_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ func Test_calculateVPARecommendation(t *testing.T) {
},
vpaSpec: &v1alpha1.VPASpec{
ResourceUnit: &v1alpha1.ResourceUnit{
Cpu: resource.MustParse("200m"),
CPU: resource.MustParse("200m"),
Memory: resource.MustParse("800Mi"),
},
},
Expand Down Expand Up @@ -91,7 +91,7 @@ func Test_calculateVPARecommendation(t *testing.T) {
},
vpaSpec: &v1alpha1.VPASpec{
ResourceUnit: &v1alpha1.ResourceUnit{
Cpu: resource.MustParse("0.2"), // 200m
CPU: resource.MustParse("0.2"), // 200m
Memory: resource.MustParse("838860800"), // 800Mi
},
},
Expand Down Expand Up @@ -126,7 +126,7 @@ func Test_calculateVPARecommendation(t *testing.T) {
},
vpaSpec: &v1alpha1.VPASpec{
ResourceUnit: &v1alpha1.ResourceUnit{
Cpu: resource.MustParse("0.2"),
CPU: resource.MustParse("0.2"),
Memory: resource.MustParse("838860800"),
},
},
Expand Down Expand Up @@ -161,7 +161,7 @@ func Test_calculateVPARecommendation(t *testing.T) {
},
vpaSpec: &v1alpha1.VPASpec{
ResourceUnit: &v1alpha1.ResourceUnit{
Cpu: resource.MustParse("200m"),
CPU: resource.MustParse("200m"),
Memory: resource.MustParse("800Mi"),
},
},
Expand Down Expand Up @@ -195,7 +195,7 @@ func Test_calculateVPARecommendation(t *testing.T) {
},
vpaSpec: &v1alpha1.VPASpec{
ResourceUnit: &v1alpha1.ResourceUnit{
Cpu: resource.MustParse("200m"),
CPU: resource.MustParse("200m"),
Memory: resource.MustParse("838860800"),
},
},
Expand Down Expand Up @@ -229,7 +229,7 @@ func Test_calculateVPARecommendation(t *testing.T) {
},
vpaSpec: &v1alpha1.VPASpec{
ResourceUnit: &v1alpha1.ResourceUnit{
Cpu: resource.MustParse("200m"),
CPU: resource.MustParse("200m"),
Memory: resource.MustParse("800Mi"),
},
},
Expand Down Expand Up @@ -263,7 +263,7 @@ func Test_calculateVPARecommendation(t *testing.T) {
},
vpaSpec: &v1alpha1.VPASpec{
ResourceUnit: &v1alpha1.ResourceUnit{
Cpu: resource.MustParse("200m"),
CPU: resource.MustParse("200m"),
Memory: resource.MustParse("800Mi"),
},
},
Expand Down Expand Up @@ -297,7 +297,7 @@ func Test_calculateVPARecommendation(t *testing.T) {
},
vpaSpec: &v1alpha1.VPASpec{
ResourceUnit: &v1alpha1.ResourceUnit{
Cpu: resource.MustParse("200m"),
CPU: resource.MustParse("200m"),
Memory: resource.MustParse("800Mi"),
},
},
Expand Down Expand Up @@ -342,7 +342,7 @@ func Test_calculateVPARecommendation(t *testing.T) {
},
vpaSpec: &v1alpha1.VPASpec{
ResourceUnit: &v1alpha1.ResourceUnit{
Cpu: resource.MustParse("200m"),
CPU: resource.MustParse("200m"),
Memory: resource.MustParse("800Mi"),
},
},
Expand Down

0 comments on commit 4b3a364

Please sign in to comment.