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

Merge pull request #12730 from johngmyers/fix-deprecated 

Fix use of deprecated method
This commit is contained in:
Kubernetes Prow Robot 2021-11-13 23:22:46 -08:00 committed by GitHub
parent 527704f502 c5914d6ddb
commit ec7fe88868
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/apis/kops/validation/validation.go
View File

@ -1434,7 +1434,7 @@ func validateRollingUpdate(rollingUpdate *kops.RollingUpdate, fldpath *field.Pat
var err error var err error
unavailable := 1 unavailable := 1
if rollingUpdate.MaxUnavailable != nil { if rollingUpdate.MaxUnavailable != nil {
unavailable, err = intstr.GetValueFromIntOrPercent(rollingUpdate.MaxUnavailable, 1, false) unavailable, err = intstr.GetScaledValueFromIntOrPercent(rollingUpdate.MaxUnavailable, 1, false)
if err != nil { if err != nil {
allErrs = append(allErrs, field.Invalid(fldpath.Child("maxUnavailable"), rollingUpdate.MaxUnavailable, allErrs = append(allErrs, field.Invalid(fldpath.Child("maxUnavailable"), rollingUpdate.MaxUnavailable,
fmt.Sprintf("Unable to parse: %v", err))) fmt.Sprintf("Unable to parse: %v", err)))
@ -1444,7 +1444,7 @@ func validateRollingUpdate(rollingUpdate *kops.RollingUpdate, fldpath *field.Pat
} }
} }
if rollingUpdate.MaxSurge != nil { if rollingUpdate.MaxSurge != nil {
surge, err := intstr.GetValueFromIntOrPercent(rollingUpdate.MaxSurge, 1000, true) surge, err := intstr.GetScaledValueFromIntOrPercent(rollingUpdate.MaxSurge, 1000, true)
if err != nil { if err != nil {
allErrs = append(allErrs, field.Invalid(fldpath.Child("maxSurge"), rollingUpdate.MaxSurge, allErrs = append(allErrs, field.Invalid(fldpath.Child("maxSurge"), rollingUpdate.MaxSurge,
fmt.Sprintf("Unable to parse: %v", err))) fmt.Sprintf("Unable to parse: %v", err)))

4
pkg/instancegroups/settings.go
View File

@ -54,7 +54,7 @@ func resolveSettings(cluster *kops.Cluster, group *kops.InstanceGroup, numInstan
} }
if rollingUpdate.MaxSurge.Type == intstr.String { if rollingUpdate.MaxSurge.Type == intstr.String {
surge, _ := intstr.GetValueFromIntOrPercent(rollingUpdate.MaxSurge, numInstances, true) surge, _ := intstr.GetScaledValueFromIntOrPercent(rollingUpdate.MaxSurge, numInstances, true)
surgeInt := intstr.FromInt(surge) surgeInt := intstr.FromInt(surge)
rollingUpdate.MaxSurge = &surgeInt rollingUpdate.MaxSurge = &surgeInt
} }
@ -68,7 +68,7 @@ func resolveSettings(cluster *kops.Cluster, group *kops.InstanceGroup, numInstan
} }
if rollingUpdate.MaxUnavailable.Type == intstr.String { if rollingUpdate.MaxUnavailable.Type == intstr.String {
unavailable, _ := intstr.GetValueFromIntOrPercent(rollingUpdate.MaxUnavailable, numInstances, false) unavailable, _ := intstr.GetScaledValueFromIntOrPercent(rollingUpdate.MaxUnavailable, numInstances, false)
if unavailable <= 0 { if unavailable <= 0 {
// While we round down, percentages should resolve to a minimum of 1 // While we round down, percentages should resolve to a minimum of 1
unavailable = 1 unavailable = 1