Skip to content

chore: sync with upstream kubernetes-sigs/karpenter main#3

Open
jeremywgleeson wants to merge 6 commits intomainfrom
devin/1773537338-sync-upstream-main
Open

chore: sync with upstream kubernetes-sigs/karpenter main#3
jeremywgleeson wants to merge 6 commits intomainfrom
devin/1773537338-sync-upstream-main

Conversation

@jeremywgleeson
Copy link
Copy Markdown

chore: sync with upstream kubernetes-sigs/karpenter main

Summary

Fast-forwards exa-labs/karpenter main to match upstream kubernetes-sigs/karpenter main. Brings in 6 upstream commits:

  • feat: add a nodepool cost metric 2 (#2847) — new ClusterCost tracker in pkg/controllers/state/informer/cost/ with per-nodepool and cluster-wide cost metrics
  • docs(rfc): add grace period support for do-not-disrupt pod annotation (#2656) — design doc for time-limited karpenter.sh/do-not-disrupt values (e.g. "4h")
  • chore: show nodepools when showing disruption commands (#2862)
  • chore: add minDrainTime (#2709)
  • chore: bump go to 1.26.1 (#2904)
  • chore(deps): bump golang.org/x/text from 0.33.0 to 0.34.0 (#2845)

No exa-specific code on main was modified — origin/main was a direct ancestor of upstream/main, so this is a clean fast-forward.

Review & Testing Checklist for Human

  • Verify the jeremy/rolling-restart-consolidation branch rebases cleanly onto this updated main (particularly pkg/controllers/disruption/types.go and pkg/controllers/state/statenode.go which are touched by both the cost metric feature and rolling restart)
  • Confirm Go 1.26.1 bump is compatible with the monorepo's karpenter.yaml build workflow (currently uses go-version: "1.22" — may need updating)
  • Spot-check that the karpenter-provider-aws fork's go.mod replace directive (replace sigs.k8s.io/karpenter => ../base) still resolves after this update

Notes

  • Requested by: @jeremywgleeson
  • Devin Session
  • Next steps after merge: rebase rolling restart branch, sync provider-aws fork, update monorepo submodules

@devin-ai-integration
Copy link
Copy Markdown

🤖 Devin AI Engineer

I'll be helping with this pull request! Here's what you should know:

✅ I will automatically:

  • Address comments on this PR. Add '(aside)' to your comment to have me ignore it.
  • Look at CI failures and help fix them

Note: I can only respond to comments from users who have write access to this repository.

⚙️ Control Options:

  • Disable automatic comment and CI monitoring

@coveralls
Copy link
Copy Markdown

Pull Request Test Coverage Report for Build 23100449680

Details

  • 225 of 324 (69.44%) changed or added relevant lines in 9 files are covered.
  • 1 unchanged line in 1 file lost coverage.
  • Overall coverage decreased (-0.2%) to 80.268%

Changes Missing Coverage Covered Lines Changed/Added Lines %
pkg/controllers/state/informer/nodeclaim.go 4 8 50.0%
pkg/controllers/controllers.go 0 5 0.0%
pkg/controllers/state/informer/nodepool.go 6 13 46.15%
pkg/controllers/state/informer/pricing.go 18 59 30.51%
pkg/state/cost/cost.go 170 212 80.19%
Files with Coverage Reduction New Missed Lines %
pkg/controllers/state/informer/nodepool.go 1 60.0%
Totals Coverage Status
Change from base Build 22327604045: -0.2%
Covered Lines: 12078
Relevant Lines: 15047

💛 - Coveralls

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants