Skip to content

Conversation

@pjiang-dev
Copy link
Contributor

@pjiang-dev pjiang-dev commented Jun 11, 2025

closes #22805
Includes

  1. All k8s libs and controller runtime to 1.33.1. Then ran go mod tidy, go mod vendor
  2. Ran make codegen local to generate all code with new k8s version
  3. New controller-runtime has a breaking change where we need to create a manager to create a controller, so i've created a fake manager for the test to maintain the same test coverage.

Minor changes to controller metrics test as now we cannot use a 'nil' manager with latest controller-runtime

Checklist:

  • Either (a) I've created an enhancement proposal and discussed it with the community, (b) this is a bug fix, or (c) this does not need to be in the release notes.
  • The title of the PR states what changed and the related issues number (used for the release note).
  • The title of the PR conforms to the Toolchain Guide
  • I've included "Closes [ISSUE #]" or "Fixes [ISSUE #]" in the description to automatically close the associated issue.
  • I've updated both the CLI and UI to expose my feature, or I plan to submit a second PR with them.
  • Does this PR require documentation updates?
  • I've updated documentation as required by this PR.
  • I have signed off all my commits as required by DCO
  • I have written unit and/or e2e tests for my change. PRs without these are unlikely to be merged.
  • My build is green (troubleshooting builds).
  • My new feature complies with the feature status guidelines.
  • I have added a brief description of why this PR is necessary and/or what this PR solves.
  • Optional. My organization is added to USERS.md.
  • Optional. For bug fixes, I've indicated what older releases this fix should be cherry-picked into (this may or may not happen depending on risk/complexity).

@bunnyshell
Copy link

bunnyshell bot commented Jun 11, 2025

❌ Preview Environment deleted from Bunnyshell

Available commands (reply to this comment):

  • 🚀 /bns:deploy to deploy the environment

@pjiang-dev pjiang-dev force-pushed the pjiang/k8s-1.33.1-upgrade branch 2 times, most recently from fe8ff57 to 76529dd Compare June 12, 2025 18:20
@codecov
Copy link

codecov bot commented Jun 12, 2025

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 59.97%. Comparing base (44fce0e) to head (f64f8fd).
⚠️ Report is 418 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master   #23362      +/-   ##
==========================================
+ Coverage   59.95%   59.97%   +0.02%     
==========================================
  Files         342      342              
  Lines       58660    58663       +3     
==========================================
+ Hits        35168    35182      +14     
+ Misses      20639    20625      -14     
- Partials     2853     2856       +3     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@pjiang-dev pjiang-dev marked this pull request as ready for review June 12, 2025 22:32
@pjiang-dev pjiang-dev requested review from a team as code owners June 12, 2025 22:32
@agaudreault agaudreault added this to the v3.1 milestone Jun 12, 2025
Copy link
Contributor

@andrii-korotkov andrii-korotkov left a comment

Choose a reason for hiding this comment

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

There seems to be a number of unrelated changes, can we move those to separate PRs, please, making this as small as possible?

@pjiang-dev
Copy link
Contributor Author

pjiang-dev commented Jun 13, 2025

There seems to be a number of unrelated changes, can we move those to separate PRs, please, making this as small as possible?

Actually all the changes are made are from re-running the make codegen-local command. This is to ensure the new version 1.33.1 is compatible with existing generated code.

The only other change is the metrics_test which is a required change when upgrading controller-runtime to the latest version.

i've updated the PR description to describe everything that was changed.

@pjiang-dev pjiang-dev force-pushed the pjiang/k8s-1.33.1-upgrade branch from c7ed91f to f64f8fd Compare June 13, 2025 16:26
@crenshaw-dev crenshaw-dev enabled auto-merge (squash) June 13, 2025 16:31
@crenshaw-dev crenshaw-dev merged commit 1df47e9 into argoproj:master Jun 13, 2025
27 checks passed
dsuhinin pushed a commit to dsuhinin/argo-cd that referenced this pull request Jun 16, 2025
Signed-off-by: Peter Jiang <[email protected]>
Signed-off-by: dsuhinin <[email protected]>
jcogilvie pushed a commit to Sanyaku/argo-cd that referenced this pull request Jun 16, 2025
Signed-off-by: Peter Jiang <[email protected]>
Signed-off-by: Jonathan Ogilvie <[email protected]>
enneitex pushed a commit to enneitex/argo-cd that referenced this pull request Aug 24, 2025
Signed-off-by: Peter Jiang <[email protected]>
Signed-off-by: enneitex <[email protected]>
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.

Bump Kubernetes v1.33

4 participants