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

use .spec.replicas instead to take a desired replica number #379

Merged
merged 1 commit into from
Mar 5, 2024
Merged

use .spec.replicas instead to take a desired replica number #379

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
1 change: 0 additions & 1 deletion controllers/testdata/deletion-no-delete/before/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,4 @@ spec:
requests:
cpu: "4"
memory: 4Gi
status:
replicas: 10
1 change: 0 additions & 1 deletion controllers/testdata/deletion-policy-all/before/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,4 @@ spec:
requests:
cpu: "4"
memory: 4Gi
status:
replicas: 10
1 change: 0 additions & 1 deletion controllers/testdata/mutable-autoscalingpolicy-add-another-horizontal/before/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,4 @@ spec:
requests:
cpu: "4"
memory: 4Gi
status:
replicas: 10
1 change: 0 additions & 1 deletion ...llers/testdata/mutable-autoscalingpolicy-no-hpa-and-add-horizontal/before/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,4 @@ spec:
requests:
cpu: "4"
memory: 4Gi
status:
replicas: 10
1 change: 0 additions & 1 deletion controllers/testdata/mutable-autoscalingpolicy-remove-horizontal-2/before/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,4 @@ spec:
requests:
cpu: "4"
memory: 4Gi
status:
replicas: 10
1 change: 0 additions & 1 deletion controllers/testdata/mutable-autoscalingpolicy-remove-horizontal/before/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,4 @@ spec:
requests:
cpu: "4"
memory: 4Gi
status:
replicas: 10
1 change: 0 additions & 1 deletion controllers/testdata/reconcile-for-the-istio-enabled-pod-working/before/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,4 @@ spec:
requests:
cpu: "10"
memory: 10Gi
status:
replicas: 10
1 change: 0 additions & 1 deletion ...rollers/testdata/reconcile-for-the-multiple-containers-pod-all-off/before/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,4 @@ spec:
requests:
cpu: "4"
memory: 4Gi
status:
replicas: 10
1 change: 0 additions & 1 deletion ...rs/testdata/reconcile-for-the-multiple-containers-pod-all-vertical/before/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,4 @@ spec:
requests:
cpu: "4"
memory: 4Gi
status:
replicas: 10
1 change: 0 additions & 1 deletion ...estdata/reconcile-for-the-multiple-containers-pod-during-emergency/before/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,4 @@ spec:
requests:
cpu: "4"
memory: 4Gi
status:
replicas: 10
1 change: 0 additions & 1 deletion ...stdata/reconcile-for-the-multiple-containers-pod-emergency-started/before/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,4 @@ spec:
requests:
cpu: "4"
memory: 4Gi
status:
replicas: 10
1 change: 0 additions & 1 deletion ...rollers/testdata/reconcile-for-the-multiple-containers-pod-one-off/before/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,4 @@ spec:
requests:
cpu: "4"
memory: 4Gi
status:
replicas: 10
1 change: 0 additions & 1 deletion ...data/reconcile-for-the-multiple-containers-pod-suggested-too-small/before/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,4 @@ spec:
requests:
cpu: "4"
memory: 4Gi
status:
replicas: 10
1 change: 0 additions & 1 deletion ...rollers/testdata/reconcile-for-the-multiple-containers-pod-working/before/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,4 @@ spec:
requests:
cpu: "4"
memory: 4Gi
status:
replicas: 10
1 change: 0 additions & 1 deletion ...llers/testdata/reconcile-for-the-single-container-pod-backtonormal/before/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,4 @@ spec:
requests:
cpu: "4"
memory: 4Gi
status:
replicas: 10
1 change: 0 additions & 1 deletion controllers/testdata/reconcile-for-the-single-container-pod-dryrun/before/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,4 @@ spec:
requests:
cpu: "4"
memory: 4Gi
status:
replicas: 10
1 change: 0 additions & 1 deletion .../testdata/reconcile-for-the-single-container-pod-emergency-started/before/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,4 @@ spec:
requests:
cpu: "4"
memory: 4Gi
status:
replicas: 10
1 change: 0 additions & 1 deletion ...ata/reconcile-for-the-single-container-pod-gathering-data-finished/before/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,4 @@ spec:
requests:
cpu: "4"
memory: 4Gi
status:
replicas: 10
1 change: 0 additions & 1 deletion ...ers/testdata/reconcile-for-the-single-container-pod-gathering-data/before/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,4 @@ spec:
requests:
cpu: "4"
memory: 4Gi
status:
replicas: 10
1 change: 0 additions & 1 deletion ...ollers/testdata/reconcile-for-the-single-container-pod-hpa-changed/before/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,4 @@ spec:
requests:
cpu: "4"
memory: 4Gi
status:
replicas: 10
1 change: 0 additions & 1 deletion ...llers/testdata/reconcile-for-the-single-container-pod-initializing/before/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,4 @@ spec:
requests:
cpu: "4"
memory: 4Gi
status:
replicas: 10
1 change: 0 additions & 1 deletion ...ers/testdata/reconcile-for-the-single-container-pod-partly-working/before/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,4 @@ spec:
requests:
cpu: "4"
memory: 4Gi
status:
replicas: 10
1 change: 0 additions & 1 deletion controllers/testdata/reconcile-for-the-single-container-pod-working/before/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,4 @@ spec:
requests:
cpu: "4"
memory: 4Gi
status:
replicas: 10
16 changes: 11 additions & 5 deletions controllers/tortoise_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,13 @@ func (r *TortoiseReconciler) Reconcile(ctx context.Context, req ctrl.Request) (_
logger.Error(err, "failed to get deployment", "tortoise", req.NamespacedName)
return ctrl.Result{}, err
}
currentReplicaNum := dm.Status.Replicas
if dm.Spec.Replicas == nil {
logger.Error(nil, "the deployment doesn't have the number of replicas and tortoise cannot calculate the recommendation", "tortoise", req.NamespacedName, "deployment", klog.KObj(dm))
return ctrl.Result{}, nil

}

currentDesiredReplicaNum := *dm.Spec.Replicas // Use the desired replica number.

if tortoise.Spec.UpdateMode == autoscalingv1beta3.UpdateModeOff /* When Off, ContainerResourceRequests should be reset */ ||
tortoise.Status.Conditions.ContainerResourceRequests == nil /* The first reconciliation */ {
Expand All @@ -191,7 +197,7 @@ func (r *TortoiseReconciler) Reconcile(ctx context.Context, req ctrl.Request) (_
if tortoise.Status.TortoisePhase == autoscalingv1beta3.TortoisePhaseInitializing {
logger.Info("initializing tortoise", "tortoise", req.NamespacedName)
// need to initialize HPA and VPA.
if err := r.initializeVPAAndHPA(ctx, tortoise, currentReplicaNum, now); err != nil {
if err := r.initializeVPAAndHPA(ctx, tortoise, currentDesiredReplicaNum, now); err != nil {
return ctrl.Result{}, fmt.Errorf("initialize VPA and HPA: %w", err)
}

Expand All @@ -204,7 +210,7 @@ func (r *TortoiseReconciler) Reconcile(ctx context.Context, req ctrl.Request) (_
return ctrl.Result{}, fmt.Errorf("add finalizer: %w", err)
}

tortoise, err = r.HpaService.UpdateHPASpecFromTortoiseAutoscalingPolicy(ctx, tortoise, hpa, currentReplicaNum, now)
tortoise, err = r.HpaService.UpdateHPASpecFromTortoiseAutoscalingPolicy(ctx, tortoise, hpa, currentDesiredReplicaNum, now)
if err != nil {
logger.Error(err, "update HPA spec from Tortoise autoscaling policy", "tortoise", req.NamespacedName)
return ctrl.Result{}, err
Expand Down Expand Up @@ -243,7 +249,7 @@ func (r *TortoiseReconciler) Reconcile(ctx context.Context, req ctrl.Request) (_

tortoise = r.TortoiseService.UpdateContainerRecommendationFromVPA(tortoise, monitorvpa, now)

tortoise, err = r.RecommenderService.UpdateRecommendations(ctx, tortoise, hpa, currentReplicaNum, now)
tortoise, err = r.RecommenderService.UpdateRecommendations(ctx, tortoise, hpa, currentDesiredReplicaNum, now)
if err != nil {
logger.Error(err, "update recommendation in tortoise", "tortoise", req.NamespacedName)
return ctrl.Result{}, err
Expand All @@ -266,7 +272,7 @@ func (r *TortoiseReconciler) Reconcile(ctx context.Context, req ctrl.Request) (_
return ctrl.Result{}, err
}

tortoise, err = r.TortoiseService.UpdateResourceRequest(ctx, tortoise, currentReplicaNum, now)
tortoise, err = r.TortoiseService.UpdateResourceRequest(ctx, tortoise, currentDesiredReplicaNum, now)
if err != nil {
logger.Error(err, "update VPA based on the recommendation in tortoise", "tortoise", req.NamespacedName)
return ctrl.Result{}, err
Expand Down
Loading