Skip to content

autoscaler: ensure HPA min replicas is not below Stack replicas #441

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+32 −14
Open

autoscaler: ensure HPA min replicas is not below Stack replicas #441

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
14 changes: 7 additions & 7 deletions pkg/client/clientset/versioned/fake/register.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions pkg/client/clientset/versioned/scheme/register.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions pkg/core/autoscaler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,3 +503,16 @@ func TestStackSetController_ReconcileHPA(t *testing.T) {
require.Equal(t, int32(1), *hpa.Spec.MinReplicas, "min replicas not generated correctly")
require.Equal(t, int32(10), hpa.Spec.MaxReplicas, "max replicas generated incorrectly")
}

func TestStackSetController_ReconcileHPA_MinReplicasNotLessThanStackReplicas(t *testing.T) {
ssc := generateHPA(1, 10)

stackReplicas := int32(5)
ssc.Stack.Spec.Replicas = &stackReplicas

hpa, err := ssc.GenerateHPA()
require.NoError(t, err, "failed to create an HPA")
require.NotNil(t, hpa, "hpa not generated")

require.Equal(t, int32(5), *hpa.Spec.MinReplicas, "min replicas does not match stack replicas")
}
5 changes: 5 additions & 0 deletions pkg/core/stack_resources.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,11 @@ func (sc *StackContainer) GenerateHPA() (*autoscaling.HorizontalPodAutoscaler, e
result.Spec.Behavior = hpaSpec.Behavior
}

// Ensure HPA min replicas is not below Stack replicas in case Stack was scaled
if sc.Stack.Spec.Replicas != nil && (result.Spec.MinReplicas == nil || *result.Spec.MinReplicas < *sc.Stack.Spec.Replicas) {
result.Spec.MinReplicas = sc.Stack.Spec.Replicas
}

// If prescaling is enabled, ensure we have at least `precalingReplicas` pods
if sc.prescalingActive && (result.Spec.MinReplicas == nil || *result.Spec.MinReplicas < sc.prescalingReplicas) {
pr := sc.prescalingReplicas
Expand Down