From c5914d6ddb0e12118627feac45b4477fb7ab2c82 Mon Sep 17 00:00:00 2001 From: John Gardiner Myers Date: Sat, 13 Nov 2021 20:29:52 -0800 Subject: [PATCH] Fix use of deprecated method --- pkg/apis/kops/validation/validation.go | 4 ++-- pkg/instancegroups/settings.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/apis/kops/validation/validation.go b/pkg/apis/kops/validation/validation.go index f30da269ca..cec409e2da 100644 --- a/pkg/apis/kops/validation/validation.go +++ b/pkg/apis/kops/validation/validation.go @@ -1434,7 +1434,7 @@ func validateRollingUpdate(rollingUpdate *kops.RollingUpdate, fldpath *field.Pat var err error unavailable := 1 if rollingUpdate.MaxUnavailable != nil { - unavailable, err = intstr.GetValueFromIntOrPercent(rollingUpdate.MaxUnavailable, 1, false) + unavailable, err = intstr.GetScaledValueFromIntOrPercent(rollingUpdate.MaxUnavailable, 1, false) if err != nil { allErrs = append(allErrs, field.Invalid(fldpath.Child("maxUnavailable"), rollingUpdate.MaxUnavailable, fmt.Sprintf("Unable to parse: %v", err))) @@ -1444,7 +1444,7 @@ func validateRollingUpdate(rollingUpdate *kops.RollingUpdate, fldpath *field.Pat } } if rollingUpdate.MaxSurge != nil { - surge, err := intstr.GetValueFromIntOrPercent(rollingUpdate.MaxSurge, 1000, true) + surge, err := intstr.GetScaledValueFromIntOrPercent(rollingUpdate.MaxSurge, 1000, true) if err != nil { allErrs = append(allErrs, field.Invalid(fldpath.Child("maxSurge"), rollingUpdate.MaxSurge, fmt.Sprintf("Unable to parse: %v", err))) diff --git a/pkg/instancegroups/settings.go b/pkg/instancegroups/settings.go index 1f6183adfc..e6247f3544 100644 --- a/pkg/instancegroups/settings.go +++ b/pkg/instancegroups/settings.go @@ -54,7 +54,7 @@ func resolveSettings(cluster *kops.Cluster, group *kops.InstanceGroup, numInstan } if rollingUpdate.MaxSurge.Type == intstr.String { - surge, _ := intstr.GetValueFromIntOrPercent(rollingUpdate.MaxSurge, numInstances, true) + surge, _ := intstr.GetScaledValueFromIntOrPercent(rollingUpdate.MaxSurge, numInstances, true) surgeInt := intstr.FromInt(surge) rollingUpdate.MaxSurge = &surgeInt } @@ -68,7 +68,7 @@ func resolveSettings(cluster *kops.Cluster, group *kops.InstanceGroup, numInstan } if rollingUpdate.MaxUnavailable.Type == intstr.String { - unavailable, _ := intstr.GetValueFromIntOrPercent(rollingUpdate.MaxUnavailable, numInstances, false) + unavailable, _ := intstr.GetScaledValueFromIntOrPercent(rollingUpdate.MaxUnavailable, numInstances, false) if unavailable <= 0 { // While we round down, percentages should resolve to a minimum of 1 unavailable = 1