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

Delay scaling down after rollout #32

Merged
merged 1 commit into from
Jul 4, 2024
Merged

Delay scaling down after rollout #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 12 additions & 0 deletions e2e/e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,30 +186,42 @@ var _ = Describe("E2E", func() {

time.Sleep(10 * time.Second)

// The old replica set should no be scaled down
err = k8sClient.Get(ctx, types.NamespacedName{Name: oldRS.Name, Namespace: namespace}, oldRS)
Expect(err).ShouldNot(HaveOccurred())
Expect(oldRS.Status.Replicas).Should(Equal(int32(replicas)))
klog.Infof("The old ReplicaSet replicas: %d", oldRS.Status.Replicas)

// Wait 120 seconds
time.Sleep(120 * time.Second)
// The old replica set should be scaled down
err = k8sClient.Get(ctx, types.NamespacedName{Name: oldRS.Name, Namespace: namespace}, oldRS)
Expect(err).ShouldNot(HaveOccurred())
Expect(oldRS.Status.Replicas).Should(Equal(int32(replicas - perOnce)))
klog.Infof("The old ReplicaSet replicas: %d", oldRS.Status.Replicas)

// Wait 120 seconds
time.Sleep(120 * time.Second)
// The old replica set should be scaled down
err = k8sClient.Get(ctx, types.NamespacedName{Name: oldRS.Name, Namespace: namespace}, oldRS)
Expect(err).ShouldNot(HaveOccurred())
Expect(oldRS.Status.Replicas).Should(Equal(int32(replicas - perOnce*2)))
klog.Infof("The old ReplicaSet replicas: %d", oldRS.Status.Replicas)

// Wait 120 seconds
time.Sleep(120 * time.Second)
// The old replica set should be scaled down
err = k8sClient.Get(ctx, types.NamespacedName{Name: oldRS.Name, Namespace: namespace}, oldRS)
Expect(err).ShouldNot(HaveOccurred())
Expect(oldRS.Status.Replicas).Should(Equal(int32(replicas - perOnce*3)))
klog.Infof("The old ReplicaSet replicas: %d", oldRS.Status.Replicas)

// Wait 120 seconds
time.Sleep(120 * time.Second)
// The old replica set should be scaled down
err = k8sClient.Get(ctx, types.NamespacedName{Name: oldRS.Name, Namespace: namespace}, oldRS)
Expect(err).ShouldNot(HaveOccurred())
Expect(oldRS.Status.Replicas).Should(Equal(int32(replicas - perOnce*4)))
klog.Infof("The old ReplicaSet replicas: %d", oldRS.Status.Replicas)
})
})
14 changes: 12 additions & 2 deletions internal/controller/argorollout_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ func (r *ArgoRolloutReconciler) Reconcile(ctx context.Context, req ctrl.Request)
}
klog.V(1).Infof("Old ReplicaSet: %s/%s", rs.Namespace, rs.Name)

retry, err := r.scaleDown(ctx, rs, targetScaleDown)
retry, err := r.scaleDown(ctx, rs, targetScaleDown, argoRollout)
if err != nil {
klog.Errorf("Failed to scale down ReplicaSet: %v", err)
return ctrl.Result{}, err
Expand Down Expand Up @@ -132,7 +132,17 @@ func isCompleted(status *argorolloutsapiv1alpha1.RolloutStatus) bool {
return false
}

func (r *ArgoRolloutReconciler) scaleDown(ctx context.Context, rs *appsv1.ReplicaSet, scaleDown *optimizerv1alpha1.RolloutScaleDown) (time.Duration, error) {
func (r *ArgoRolloutReconciler) scaleDown(ctx context.Context, rs *appsv1.ReplicaSet, scaleDown *optimizerv1alpha1.RolloutScaleDown, rollout *argorolloutsapiv1alpha1.Rollout) (time.Duration, error) {
rolloutUpdated := time.Now()
for _, cond := range rollout.Status.Conditions {
if cond.Type == argorolloutsapiv1alpha1.RolloutCompleted {
rolloutUpdated = cond.LastUpdateTime.Time
}
}
if rolloutUpdated.Add(time.Duration(scaleDown.Spec.CoolTimeSeconds) * time.Second).After(time.Now()) {
return 30 * time.Second, nil
}

lastUpdated := scaleDown.Status.LastScaleDownTime
if lastUpdated.Add(time.Duration(scaleDown.Spec.CoolTimeSeconds) * time.Second).After(time.Now()) {
return 30 * time.Second, nil
Expand Down