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

fix cluster-autoscaler addon #13202

Merged
merged 1 commit into from
Mar 21, 2024
Merged

fix cluster-autoscaler addon #13202

merged 1 commit into from
Mar 21, 2024

Conversation

xrstf
Copy link
Contributor

@xrstf xrstf commented Mar 21, 2024

What this PR does / why we need it:
After updating the autoscaler on one of our dev systems, I noticed that the cluster-name based grouping didn't work. And from my quick testing, creating an AWS cluster on dev and installing the autoscaler addon will not work. So I adjusted the config to match what we use in our other system, which @xmudrii recommended to me. Downside is that it will only work for MDs in the kube-system namespace.

I also removed the master toleration. There are no master nodes in a KKP usercluster.

What type of PR is this?
/kind bug

Does this PR introduce a user-facing change? Then add your Release Note here:

cluster-autoscaler addon now works based on the namespace instead of cluster names; all MachineDeployments in the `kube-system` namespace are scaled.

Documentation:

NONE

@xrstf xrstf requested a review from kron4eg March 21, 2024 12:19
@xrstf xrstf self-assigned this Mar 21, 2024
@kubermatic-bot kubermatic-bot added docs/none Denotes a PR that doesn't need documentation (changes). release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/bug Categorizes issue or PR as related to a bug. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. sig/app-management Denotes a PR or issue as being assigned to SIG App Management. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Mar 21, 2024
@kron4eg
Copy link
Member

kron4eg commented Mar 21, 2024

/approve
/lgtm

@kubermatic-bot kubermatic-bot added the lgtm Indicates that a PR is ready to be merged. label Mar 21, 2024
@kubermatic-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 3f3784421c6d015591e9e5b9eef043b5a8f8ec98

@xrstf
Copy link
Contributor Author

xrstf commented Mar 21, 2024

/approve

@kubermatic-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kron4eg, xrstf

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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@kubermatic-bot kubermatic-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 21, 2024
@xrstf
Copy link
Contributor Author

xrstf commented Mar 21, 2024

/cherrypick release/v2.25

@kubermatic-bot
Copy link
Contributor

@xrstf: once the present PR merges, I will cherry-pick it on top of release/v2.25 in a new PR and assign it to you.

In response to this:

/cherrypick release/v2.25

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@xrstf
Copy link
Contributor Author

xrstf commented Mar 21, 2024

/cherrypick release/v2.24

@kubermatic-bot
Copy link
Contributor

@xrstf: once the present PR merges, I will cherry-pick it on top of release/v2.24 in a new PR and assign it to you.

In response to this:

/cherrypick release/v2.24

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@xrstf
Copy link
Contributor Author

xrstf commented Mar 21, 2024

/cherrypick release/v2.23

@kubermatic-bot
Copy link
Contributor

@xrstf: once the present PR merges, I will cherry-pick it on top of release/v2.23 in a new PR and assign it to you.

In response to this:

/cherrypick release/v2.23

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@kubermatic-bot kubermatic-bot merged commit 71aaa51 into kubermatic:main Mar 21, 2024
11 checks passed
@kubermatic-bot kubermatic-bot added this to the KKP 2.25 milestone Mar 21, 2024
@kubermatic-bot
Copy link
Contributor

@xrstf: new pull request created: #13203

In response to this:

/cherrypick release/v2.25

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@kubermatic-bot kubermatic-bot mentioned this pull request Mar 21, 2024
Merged
@kubermatic-bot
Copy link
Contributor

@xrstf: #13202 failed to apply on top of branch "release/v2.24":

Applying: fix cluster-autoscaler addon
Using index info to reconstruct a base tree...
M	addons/Makefile
M	addons/cluster-autoscaler/cluster-autoscaler.yaml
Falling back to patching base and 3-way merge...
Auto-merging addons/cluster-autoscaler/cluster-autoscaler.yaml
CONFLICT (content): Merge conflict in addons/cluster-autoscaler/cluster-autoscaler.yaml
Auto-merging addons/Makefile
CONFLICT (content): Merge conflict in addons/Makefile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 fix cluster-autoscaler addon
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release/v2.24

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@kubermatic-bot
Copy link
Contributor

@xrstf: #13202 failed to apply on top of branch "release/v2.23":

Applying: fix cluster-autoscaler addon
Using index info to reconstruct a base tree...
M	addons/Makefile
M	addons/cluster-autoscaler/cluster-autoscaler.yaml
Falling back to patching base and 3-way merge...
Auto-merging addons/cluster-autoscaler/cluster-autoscaler.yaml
CONFLICT (content): Merge conflict in addons/cluster-autoscaler/cluster-autoscaler.yaml
Auto-merging addons/Makefile
CONFLICT (content): Merge conflict in addons/Makefile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 fix cluster-autoscaler addon
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release/v2.23

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@xrstf xrstf deleted the fix-autoscaler branch March 21, 2024 13:19
@embik embik mentioned this pull request Apr 16, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kron4eg kron4eg Awaiting requested review from kron4eg

Assignees

@kron4eg kron4eg

@xrstf xrstf

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. docs/none Denotes a PR that doesn't need documentation (changes). kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/app-management Denotes a PR or issue as being assigned to SIG App Management. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
KKP 2.25
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@xrstf @kron4eg @kubermatic-bot