Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor: update the PodUpdateStrategyType from ReplaceUpdate to Replace #175

Merged
merged 2 commits into from
Mar 28, 2024
Merged

refactor: update the PodUpdateStrategyType from ReplaceUpdate to Replace #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5d415e
refactor: update the PodUpdateStrategyType from ReplaceUpdate to Replace
wu8685 Mar 27, 2024
67cfa04
refactor: fix ut
wu8685 Mar 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions apis/apps/v1alpha1/collaset_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,9 @@ const (
// CollaSetInPlaceOnlyPodUpdateStrategyType indicates that CollaSet will always update Pod in-place, instead of
// recreating pod. It will encounter an error on original Kubernetes cluster.
CollaSetInPlaceOnlyPodUpdateStrategyType PodUpdateStrategyType = "InPlaceOnly"

// CollaSetReplaceUpdatePodUpdateStrategyType indicates that CollaSet will always update Pod by replace, it will
// create a new Pod and delete update pod when new created pod service available.
CollaSetReplaceUpdatePodUpdateStrategyType PodUpdateStrategyType = "ReplaceUpdate"
// CollaSetReplacePodUpdateStrategyType indicates that CollaSet will always update Pod by replace, it will
// create a new Pod and delete the old pod when the new one service available.
CollaSetReplacePodUpdateStrategyType PodUpdateStrategyType = "Replace"
)

// CollaSetSpec defines the desired state of CollaSet
Expand Down
10 changes: 5 additions & 5 deletions pkg/controllers/collaset/collaset_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -651,7 +651,7 @@ var _ = Describe("collaset controller", func() {
},
UpdateStrategy: appsv1alpha1.UpdateStrategy{
OperationDelaySeconds: int32Pointer(1),
PodUpdatePolicy: appsv1alpha1.CollaSetReplaceUpdatePodUpdateStrategyType,
PodUpdatePolicy: appsv1alpha1.CollaSetReplacePodUpdateStrategyType,
},
},
}
Expand Down Expand Up @@ -786,7 +786,7 @@ var _ = Describe("collaset controller", func() {
},
UpdateStrategy: appsv1alpha1.UpdateStrategy{
OperationDelaySeconds: int32Pointer(1),
PodUpdatePolicy: appsv1alpha1.CollaSetReplaceUpdatePodUpdateStrategyType,
PodUpdatePolicy: appsv1alpha1.CollaSetReplacePodUpdateStrategyType,
},
},
}
Expand Down Expand Up @@ -940,7 +940,7 @@ var _ = Describe("collaset controller", func() {
},
UpdateStrategy: appsv1alpha1.UpdateStrategy{
OperationDelaySeconds: int32Pointer(1),
PodUpdatePolicy: appsv1alpha1.CollaSetReplaceUpdatePodUpdateStrategyType,
PodUpdatePolicy: appsv1alpha1.CollaSetReplacePodUpdateStrategyType,
},
},
}
Expand Down Expand Up @@ -1041,7 +1041,7 @@ var _ = Describe("collaset controller", func() {
},
UpdateStrategy: appsv1alpha1.UpdateStrategy{
OperationDelaySeconds: int32Pointer(1),
PodUpdatePolicy: appsv1alpha1.CollaSetReplaceUpdatePodUpdateStrategyType,
PodUpdatePolicy: appsv1alpha1.CollaSetReplacePodUpdateStrategyType,
},
},
}
Expand Down Expand Up @@ -1599,7 +1599,7 @@ var _ = Describe("collaset controller", func() {
Partition: &partition,
},
}
cls.Spec.UpdateStrategy.PodUpdatePolicy = appsv1alpha1.CollaSetReplaceUpdatePodUpdateStrategyType
cls.Spec.UpdateStrategy.PodUpdatePolicy = appsv1alpha1.CollaSetReplacePodUpdateStrategyType
cls.Spec.ScaleStrategy.OperationDelaySeconds = int32Pointer(1)
cls.Spec.Template.Spec.Containers[0].Image = "nginx:v2"
return true
Expand Down
6 changes: 3 additions & 3 deletions pkg/controllers/collaset/synccontrol/sync_control.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ func dealReplacePods(pods []*corev1.Pod, instance *appsv1alpha1.CollaSet) (needR

needReplacePods = append(needReplacePods, pod)
}
isReplaceUpdate := instance.Spec.UpdateStrategy.PodUpdatePolicy == appsv1alpha1.CollaSetReplaceUpdatePodUpdateStrategyType
isReplaceUpdate := instance.Spec.UpdateStrategy.PodUpdatePolicy == appsv1alpha1.CollaSetReplacePodUpdateStrategyType
// deal pods need to delete when pod update strategy is not replace update

for _, pod := range pods {
Expand Down Expand Up @@ -709,7 +709,7 @@ func (r *RealSyncControl) Update(
updating := false
analysedPod := sets.NewString()

if cls.Spec.UpdateStrategy.PodUpdatePolicy != appsv1alpha1.CollaSetReplaceUpdatePodUpdateStrategyType {
if cls.Spec.UpdateStrategy.PodUpdatePolicy != appsv1alpha1.CollaSetReplacePodUpdateStrategyType {
// 3. prepare Pods to begin PodOpsLifecycle
for i, podInfo := range podToUpdate {
if podInfo.IsUpdatedRevision && !podInfo.PodDecorationChanged {
Expand Down Expand Up @@ -852,7 +852,7 @@ func (r *RealSyncControl) Update(
return err
}
}
} else if cls.Spec.UpdateStrategy.PodUpdatePolicy == appsv1alpha1.CollaSetReplaceUpdatePodUpdateStrategyType {
} else if cls.Spec.UpdateStrategy.PodUpdatePolicy == appsv1alpha1.CollaSetReplacePodUpdateStrategyType {
return nil
} else {
// 6.2 if pod has changes not in-place supported, recreate it
Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/collaset/synccontrol/update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ func newPodUpdater(ctx context.Context, client client.Client, cls *appsv1alpha1.
// In case of using native K8s, Pod is only allowed to update with container image, so InPlaceOnly policy is
// implemented with InPlaceIfPossible policy as default for compatibility.
return &inPlaceIfPossibleUpdater{collaSet: cls, ctx: ctx, Client: client}
case appsv1alpha1.CollaSetReplaceUpdatePodUpdateStrategyType:
case appsv1alpha1.CollaSetReplacePodUpdateStrategyType:
return &replaceUpdatePodUpdater{collaSet: cls, ctx: ctx, Client: client}
default:
return &inPlaceIfPossibleUpdater{collaSet: cls, ctx: ctx, Client: client}
Expand Down
4 changes: 2 additions & 2 deletions pkg/webhook/server/generic/collaset/collaset_validating_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,13 +115,13 @@ func (h *ValidatingHandler) validateUpdateStrategy(cls *appsv1alpha1.CollaSet, f
case appsv1alpha1.CollaSetRecreatePodUpdateStrategyType,
appsv1alpha1.CollaSetInPlaceOnlyPodUpdateStrategyType,
appsv1alpha1.CollaSetInPlaceIfPossiblePodUpdateStrategyType,
appsv1alpha1.CollaSetReplaceUpdatePodUpdateStrategyType:
appsv1alpha1.CollaSetReplacePodUpdateStrategyType:
default:
allErrs = append(allErrs, field.NotSupported(fSpec.Child("updateStrategy", "podUpdatePolicy"),
cls.Spec.UpdateStrategy.PodUpdatePolicy, []string{string(appsv1alpha1.CollaSetRecreatePodUpdateStrategyType),
string(appsv1alpha1.CollaSetInPlaceIfPossiblePodUpdateStrategyType),
string(appsv1alpha1.CollaSetInPlaceOnlyPodUpdateStrategyType),
string(appsv1alpha1.CollaSetReplaceUpdatePodUpdateStrategyType)}))
string(appsv1alpha1.CollaSetReplacePodUpdateStrategyType)}))
}

if cls.Spec.UpdateStrategy.RollingUpdate != nil && cls.Spec.UpdateStrategy.RollingUpdate.ByPartition != nil &&
Expand Down
2 changes: 1 addition & 1 deletion pkg/webhook/server/generic/collaset/collaset_validating_handler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ func TestValidatingCollaSet(t *testing.T) {
},
},
"invalid-update-policy": {
messageKeyWords: "supported values: \"ReCreate\", \"InPlaceIfPossible\", \"InPlaceOnly\", \"ReplaceUpdate\"",
messageKeyWords: "supported values: \"ReCreate\", \"InPlaceIfPossible\", \"InPlaceOnly\", \"Replace\"",
cls: &appsv1alpha1.CollaSet{
ObjectMeta: metav1.ObjectMeta{
Name: "foo",
Expand Down
Loading