Added autoscaler options to worker groups #9245
Merged
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
gardener-prow
bot
added
area/auto-scaling
gardener-prow
bot
added
cla: yes
|
/assign |
|
/retest |
rfranzke
requested changes
Feb 26, 2024
aaronfern
force-pushed
the
worker_group_options
branch
from
37d1ff2
to
594bd8c
Compare
|
/retest |
rfranzke
requested changes
Feb 27, 2024
|
/test pull-gardener-e2e-kind-ha-multi-zone-upgrade |
rfranzke
reviewed
Feb 28, 2024
docs/extensions/worker.md
Outdated
| @@ -115,6 +121,8 @@ The `spec.pools[].nodeTemplate.capacity` field contains the resource information | |||
|
|
|||
| The `spec.pools[].machineControllerManager` field allows to configure the settings for machine-controller-manager component. Providers must populate these settings on worker-pool to the related [fields](https://github.com/gardener/machine-controller-manager/blob/master/kubernetes/machine_objects/machine-deployment.yaml#L30-L34) in MachineDeployment. | |||
|
|
|||
| The `spec.pools[].clusterAutoscaler` field contains `cluster-autoscaler` settings that are to be applied only to specific worker group. `Cluster-autoscaler` expects to find these settings as annotations on the `MachineDeployment`, and so providers must pass these values to the corresponding `MachineDeployment` via annotations. The keys for these annotations can be found [here](https://github.com/gardener/gardener/blob/master/pkg/apis/extensions/v1alpha1/types_worker.go) and the values for the corresponding annotations should be the same as what is passed into the field. | |||
There was a problem hiding this comment.
Suggested change
| The `spec.pools[].clusterAutoscaler` field contains `cluster-autoscaler` settings that are to be applied only to specific worker group. `Cluster-autoscaler` expects to find these settings as annotations on the `MachineDeployment`, and so providers must pass these values to the corresponding `MachineDeployment` via annotations. The keys for these annotations can be found [here](https://github.com/gardener/gardener/blob/master/pkg/apis/extensions/v1alpha1/types_worker.go) and the values for the corresponding annotations should be the same as what is passed into the field. | |
| The `spec.pools[].clusterAutoscaler` field contains `cluster-autoscaler` settings that are to be applied only to specific worker group. `cluster-autoscaler` expects to find these settings as annotations on the `MachineDeployment`, and so providers must pass these values to the corresponding `MachineDeployment` via annotations. The keys for these annotations can be found [here](https://github.com/gardener/gardener/blob/master/pkg/apis/extensions/v1alpha1/types_worker.go) and the values for the corresponding annotations should be the same as what is passed into the field. |
Do you want to refer to your helper function (extensionsv1alpha1helper.GetMachineDeploymentClusterAutoscalerAnnotations)?
| @@ -1388,6 +1388,64 @@ var _ = Describe("Shoot Validation Tests", func() { | |||
| Expect(errorList).To(BeEmpty()) | |||
| }) | |||
| }) | |||
|
|
|||
| Describe("clusterAutoscaler options validation", func() { | |||
There was a problem hiding this comment.
Suggested change
| Describe("clusterAutoscaler options validation", func() { | |
| Describe("ClusterAutoscaler options validation", func() { |
Comment on lines
74
to
75
| annotations := map[string]string{} | ||
| if caOptions != nil { |
There was a problem hiding this comment.
Suggested change
| annotations := map[string]string{} | |
| if caOptions != nil { | |
| var annotations map[string]string | |
| if caOptions != nil { | |
| annotations := map[string]string{} |
| @@ -68,3 +68,27 @@ func FilePathsFrom(files []extensionsv1alpha1.File) []string { | |||
|
|
|||
| return out | |||
| } | |||
|
|
|||
| // GetMachineDeploymentClusterAutoscalerAnnotations returns a map of annotations with values intended to be used as cluster autoscaler options for the worker group | |||
There was a problem hiding this comment.
Suggested change
| // GetMachineDeploymentClusterAutoscalerAnnotations returns a map of annotations with values intended to be used as cluster autoscaler options for the worker group | |
| // GetMachineDeploymentClusterAutoscalerAnnotations returns a map of annotations with values intended to be used as cluster-autoscaler options for the worker group. |
|
LGTM label has been added. Git tree hash: e768e1a87c8bb033a7a9e8eadaa37fafa3049e33
|
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: rfranzke The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
gardener-prow
bot
added
the
approved
9 tasks
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.
How to categorize this PR?
/area auto-scaling
/kind api-change
What this PR does / why we need it:
This PR adds some
autoscaleroptions to workers.With this change, users can configure certain worker specific autoscaler options instead of one single value for all worker groups
Which issue(s) this PR fixes:
Fixes partially gardener/autoscaler#240
Special notes for your reviewer:
Autoscalerwill read these values from annotations in themachineDeployment(ref: gardener/autoscaler#257), so the values fromspec.provider.worker.autoscalerare added as annotations to themachineDeploymentRelease note: