Skip to content

add dedicated hosts pruning to aws-janitor #232

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
Open
rvanderp3 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

add dedicated hosts pruning to aws-janitor #232

rvanderp3 wants to merge 1 commit into from
+128 −0

Conversation

@rvanderp3
Copy link

@rvanderp3 rvanderp3 commented Jun 16, 2025 •
edited
Loading

Adding EC2 dedicated hosts to aws-janitor so that such feature can also be added to cluster-api-provider-aws to prevent leaking dedicated hosts.

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. sig/testing Categorizes an issue or PR as relevant to SIG Testing. labels Jun 16, 2025
@k8s-ci-robot k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Jun 16, 2025
@rvanderp3 rvanderp3 force-pushed the dedicated-hosts-boskos-rv branch 2 times, most recently from d177103 to 3236e0e Compare June 17, 2025 21:36
@rvanderp3
Copy link
Author

rvanderp3 commented Jun 19, 2025

/hold

placing hold for testing

@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 Jun 19, 2025
@rvanderp3 rvanderp3 force-pushed the dedicated-hosts-boskos-rv branch 3 times, most recently from f514627 to d1ed690 Compare June 27, 2025 20:30
@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 27, 2025
@rvanderp3 rvanderp3 force-pushed the dedicated-hosts-boskos-rv branch from d1ed690 to 1b835bb Compare June 27, 2025 20:35
@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jun 27, 2025
@rvanderp3 rvanderp3 force-pushed the dedicated-hosts-boskos-rv branch from 1b835bb to 32b00fc Compare June 27, 2025 21:08
@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented Jun 27, 2025

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: rvanderp3
Once this PR has been reviewed and has the lgtm label, please assign justinsb for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found 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 size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Jun 27, 2025
@rvanderp3 rvanderp3 force-pushed the dedicated-hosts-boskos-rv branch from 32b00fc to 9659fd6 Compare June 27, 2025 21:09
@rvanderp3
Copy link
Author

rvanderp3 commented Jun 27, 2025

confirmed that this change is able to identify and deallocate dedicated hosts

@rvanderp3 rvanderp3 force-pushed the dedicated-hosts-boskos-rv branch from 9659fd6 to cd22220 Compare June 27, 2025 21:23
@rvanderp3 rvanderp3 force-pushed the dedicated-hosts-boskos-rv branch from cd22220 to 62c5d1d Compare June 27, 2025 21:40
@rvanderp3
Copy link
Author

rvanderp3 commented Jun 28, 2025

/hold cancel

@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 Jun 28, 2025
@rvanderp3
Copy link
Author

rvanderp3 commented Jun 28, 2025

/assign @richardcase

mtulio
mtulio reviewed Jul 7, 2025
View reviewed changes
Copy link

@mtulio mtulio left a comment

Choose a reason for hiding this comment

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

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 7, 2025
@rvanderp3
Copy link
Author

rvanderp3 commented Jul 24, 2025

@richardcase would you be able to take a look at this one? thanks!

@richardcase
Copy link
Member

richardcase commented Jul 25, 2025

@richardcase would you be able to take a look at this one? thanks!

@rvanderp3 - yes for sure, i've added it to the list of things to do first thing on Monday.

richardcase
richardcase reviewed Jul 29, 2025
View reviewed changes
Copy link
Member

@richardcase richardcase left a comment

Choose a reason for hiding this comment

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

Looks good @rvanderp3

aws-janitor/resources/dedicated_host.go
@@ -0,0 +1,127 @@
/*
Copyright 2019 The Kubernetes Authors.
Copy link
Member

@richardcase richardcase Jul 29, 2025

Choose a reason for hiding this comment

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

nit:

Suggested change
Copyright 2019 The Kubernetes Authors.
Copyright 2025 The Kubernetes Authors.

aws-janitor/resources/dedicated_host.go
return set, errors.Wrapf(err, "couldn't describe DedicatedHosts for %q in %q", opts.Account, opts.Region)
}

type host struct {
Copy link
Member

@richardcase richardcase Jul 29, 2025

Choose a reason for hiding this comment

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

Could be called dedicatedHost but not strongly opinionated on this :)

@richardcase
Copy link
Member

richardcase commented Jul 29, 2025

Lets double check that there aren't any dedicated hosts in the AWS accounts that shouldn't be deleted before merging.

/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 Jul 29, 2025
@richardcase
Copy link
Member

richardcase commented Jul 29, 2025

Asked in #sig-k8s-infra: https://kubernetes.slack.com/archives/CCK68P2Q2/p1753794579701899

@richardcase richardcase mentioned this pull request Aug 4, 2025
Closed
@k8s-triage-robot
Copy link

k8s-triage-robot commented Oct 27, 2025

The Kubernetes project currently lacks enough contributors to adequately respond to all PRs.

This bot triages PRs according to the following rules:

  • After 90d of inactivity, lifecycle/stale is applied
  • After 30d of inactivity since lifecycle/stale was applied, lifecycle/rotten is applied
  • After 30d of inactivity since lifecycle/rotten was applied, the PR is closed

You can:

  • Mark this PR as fresh with /remove-lifecycle stale
  • Close this PR with /close
  • Offer to help out with Issue Triage

Please send feedback to sig-contributor-experience at kubernetes/community.

/lifecycle stale

@k8s-ci-robot k8s-ci-robot added the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Oct 27, 2025
@k8s-triage-robot
Copy link

k8s-triage-robot commented Nov 26, 2025

The Kubernetes project currently lacks enough active contributors to adequately respond to all PRs.

This bot triages PRs according to the following rules:

  • After 90d of inactivity, lifecycle/stale is applied
  • After 30d of inactivity since lifecycle/stale was applied, lifecycle/rotten is applied
  • After 30d of inactivity since lifecycle/rotten was applied, the PR is closed

You can:

  • Mark this PR as fresh with /remove-lifecycle rotten
  • Close this PR with /close
  • Offer to help out with Issue Triage

Please send feedback to sig-contributor-experience at kubernetes/community.

/lifecycle rotten

@k8s-ci-robot k8s-ci-robot added lifecycle/rotten Denotes an issue or PR that has aged beyond stale and will be auto-closed. and removed lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. labels Nov 26, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@justinsb justinsb Awaiting requested review from justinsb

2 more reviewers

@richardcase richardcase richardcase left review comments

@mtulio mtulio mtulio left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@richardcase richardcase

@mtulio mtulio

Labels

cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. lgtm "Looks good to me", indicates that a PR is ready to be merged. lifecycle/rotten Denotes an issue or PR that has aged beyond stale and will be auto-closed. sig/testing Categorizes an issue or PR as relevant to SIG Testing. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@rvanderp3 @k8s-ci-robot @richardcase @k8s-triage-robot @mtulio