Add suport for specifying percentage of pods for RollingUpdate #36
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
hex108
reviewed
Jun 18, 2020
| @@ -103,7 +104,7 @@ type TAppUpdateStrategy struct { | |||
| // Template is the rolling update template name | |||
| Template string `json:"template,omitempty"` | |||
| // MaxUnavailable is the max unavailable number when tapp is rolling update, default is 1. | |||
| MaxUnavailable *int32 `json:"maxUnavailable,omitempty"` | |||
| MaxUnavailable *intstr.IntOrString `json:"maxUnavailable,omitempty"` | |||
pkg/tapp/controller.go
Outdated
| @@ -823,7 +824,11 @@ func (c *Controller) transformPodActions(tapp *tappv1.TApp, podActions map[strin | |||
|
|
|||
| maxUnavailable := tappv1.DefaultMaxUnavailable | |||
| if tapp.Spec.UpdateStrategy.MaxUnavailable != nil { | |||
| maxUnavailable = int(*tapp.Spec.UpdateStrategy.MaxUnavailable) | |||
| var err error | |||
| maxUnavailable, err = intstr.GetValueFromIntOrPercent(tapp.Spec.UpdateStrategy.MaxUnavailable, len(rollingUpdateIds), true) | |||
There was a problem hiding this comment.
这里len(rollingUpdateIds) 改成desiredRunningPods.Len()会不会更合理
There was a problem hiding this comment.
百分比应该是指定要滚动更新的template的pod的，也就是rollingupdate的。换成desiredRunningpod会变成所有pod的
There was a problem hiding this comment.
结合现有的测试样例看了一下，其他template的更新会影响到滚动更新的template的数量，所以还是换成了desiredRunningpod。
| var err error | ||
| maxUnavailable, err = intstr.GetValueFromIntOrPercent(tapp.Spec.UpdateStrategy.MaxUnavailable, len(rollingUpdateIds), true) | ||
| if err != nil { | ||
| klog.Errorf("invalid value for MaxUnavailable: %v", err) |
qianjun1993
force-pushed
the
master
branch
2 times, most recently
from
b5535b9
to
74843d1
Compare
|
@qianjun1993 没问题了，加一个测试用例？ |
|
追加了测试用例 |
|
LGTM |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add suport for specifying percentage of pods for RollingUpdate