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.

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

Add MaxPods to KubeletConfig #2075

Merged
merged 4 commits into from
Jun 1, 2022
Merged

Add MaxPods to KubeletConfig #2075

merged 4 commits into from
Jun 1, 2022

Conversation

xmudrii
Copy link
Member

@xmudrii xmudrii commented May 31, 2022

What type of PR is this?

/kind feature

What this PR does / why we need it:

This PR adds MaxPods field to the KubeletConfig used to control the maximum number of pods per node.

Example usage:

...
controlPlane:
  hosts:
    - publicAddress: ...
      kubelet:
        maxPods: 200

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
xref #2071

Does this PR introduce a user-facing change?:

Add MaxPods field to the KubeletConfig used to control the maximum number of pods per node

/assign @kron4eg

@xmudrii xmudrii requested a review from kron4eg May 31, 2022 19:48
@kubermatic-bot kubermatic-bot added kind/feature Categorizes issue or PR as related to a new feature. release-note Denotes a PR that will be considered when it comes time to generate release notes. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels May 31, 2022
@xmudrii xmudrii marked this pull request as draft May 31, 2022 19:53
@kubermatic-bot kubermatic-bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels May 31, 2022
Signed-off-by: Marko Mudrinić <mudrinic.mare@gmail.com>
Signed-off-by: Marko Mudrinić <mudrinic.mare@gmail.com>
Signed-off-by: Marko Mudrinić <mudrinic.mare@gmail.com>
@xmudrii xmudrii marked this pull request as ready for review June 1, 2022 13:39
@kubermatic-bot kubermatic-bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 1, 2022
@xmudrii
Copy link
Member Author

xmudrii commented Jun 1, 2022

/hold
I forgot to update example config

@kubermatic-bot kubermatic-bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 1, 2022
Signed-off-by: Marko Mudrinić <mudrinic.mare@gmail.com>
@xmudrii
Copy link
Member Author

xmudrii commented Jun 1, 2022

/hold cancel

@kubermatic-bot kubermatic-bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 1, 2022
@kron4eg
Copy link
Member

kron4eg commented Jun 1, 2022

/lgtm
/approve
⚡ :this_is_fine:

@kubermatic-bot kubermatic-bot added the lgtm Indicates that a PR is ready to be merged. label Jun 1, 2022
@kubermatic-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kron4eg

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
Copy link
Contributor

LGTM label has been added.

Git tree hash: c000bc30a4183fc40723b73e816c94bc1e8ef733

@kubermatic-bot kubermatic-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 1, 2022
@kubermatic-bot kubermatic-bot merged commit 7ba5fa9 into master Jun 1, 2022
@kubermatic-bot kubermatic-bot added this to the KubeOne 1.5 milestone Jun 1, 2022
@kubermatic-bot kubermatic-bot deleted the max-pods branch June 1, 2022 14:14
@xmudrii
Copy link
Member Author

xmudrii commented Jun 1, 2022

/cherrypick release/v1.4

@kubermatic-bot
Copy link
Contributor

@xmudrii: #2075 failed to apply on top of branch "release/v1.4":

Applying: Add MaxPods to KubeletConfig
Using index info to reconstruct a base tree...
M	docs/api_reference/v1beta2.en.md
M	pkg/apis/kubeone/types.go
M	pkg/apis/kubeone/v1beta2/types.go
M	pkg/templates/kubeadm/v1beta2/kubeadm.go
M	pkg/templates/kubeadm/v1beta3/kubeadm.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/templates/kubeadm/v1beta3/kubeadm.go
Auto-merging pkg/templates/kubeadm/v1beta2/kubeadm.go
Auto-merging pkg/apis/kubeone/v1beta2/types.go
Auto-merging pkg/apis/kubeone/types.go
Auto-merging docs/api_reference/v1beta2.en.md
CONFLICT (content): Merge conflict in docs/api_reference/v1beta2.en.md
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Add MaxPods to KubeletConfig
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/v1.4

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.

@xmudrii xmudrii added kind/api-change Categorizes issue or PR as related to adding, removing, or otherwise changing an API and removed kind/feature Categorizes issue or PR as related to a new feature. labels Aug 1, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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. kind/api-change Categorizes issue or PR as related to adding, removing, or otherwise changing an API 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. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants