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

Excluding Control Plane Nodes from Topology Hints calculations #104744

Merged
merged 1 commit into from Oct 2, 2021
Merged

Excluding Control Plane Nodes from Topology Hints calculations #104744

merged 1 commit into from Oct 2, 2021

Conversation

robscott
Copy link
Member

@robscott robscott commented Sep 3, 2021 •
edited

What type of PR is this?

/kind bug

What this PR does / why we need it:

This updates Topology Hints logic to exclude control plane nodes from capacity calculations.

Which issue(s) this PR fixes:

This should at least help with #103888.

Does this PR introduce a user-facing change?

Topology Hints now excludes control plane notes from capacity calculations.

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

/sig network
/priority important-soon
/cc @aojea @thockin

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. kind/bug Categorizes issue or PR as related to a bug. sig/network Categorizes an issue or PR as relevant to SIG Network. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Sep 3, 2021
@robscott
Copy link
Member Author

robscott commented Sep 3, 2021

Adding a hold until #104741 merges.

/hold

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 3, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: robscott

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

@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. sig/apps Categorizes an issue or PR as relevant to SIG Apps. labels Sep 3, 2021
@robscott robscott mentioned this pull request Sep 10, 2021
Merged
thockin
thockin reviewed Sep 30, 2021
View reviewed changes
pkg/controller/endpointslice/topologycache/topologycache.go Outdated
// Nodes with these labels set to any value will be excluded from capacity
// calculations for Topology Hints.
var excludedLabels = sets.NewString(
"node-role.kubernetes.io/control-plane",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

don't we have some const for these?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's a const in kubeadm package, but felt strange to introduce a kubeadm dependency here. It looks like everywhere else in k/k this is hardcoded: https://cs.k8s.io/?q=node-role.kubernetes.io%2Fcontrol-plane&i=nope&files=&excludeFiles=&repos=kubernetes/kubernetes

@robscott
Copy link
Member Author

robscott commented Oct 1, 2021

Thanks for the feedback @thockin and @aojea! I've responded to everything, PTAL.

@robscott
Copy link
Member Author

robscott commented Oct 1, 2021

/triage accepted

@k8s-ci-robot k8s-ci-robot added triage/accepted Indicates an issue or PR is ready to be actively worked on. release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. release-note-none Denotes a PR that doesn't merit a release note. labels Oct 1, 2021
@aojea
Copy link
Member

aojea commented Oct 1, 2021

/hold cancel
/lgtm

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 1, 2021
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 1, 2021
@robscott
Copy link
Member Author

robscott commented Oct 1, 2021

/retest

@robscott
Copy link
Member Author

robscott commented Oct 1, 2021

/assign @thockin

@k8s-ci-robot k8s-ci-robot merged commit c54ed73 into kubernetes:master Oct 2, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.23 milestone Oct 2, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@thockin thockin thockin left review comments

@aojea aojea aojea left review comments

Assignees

@thockin thockin

@aojea aojea

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/apps Categorizes an issue or PR as relevant to SIG Apps. sig/network Categorizes an issue or PR as relevant to SIG Network. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
None yet
Milestone
v1.23
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@robscott @k8s-ci-robot @aojea @thockin