-
Notifications
You must be signed in to change notification settings - Fork 50
Bump rancher/pkg/apis, cluster-api, and otel pins #560
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
Open
dasarinaidu
wants to merge
1
commit into
rancher:main
Choose a base branch
from
dasarinaidu:pkg-apis-bump
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,41 +1,59 @@ | ||
| linters: | ||
| disable-all: true | ||
| enable: | ||
| - ineffassign | ||
| - goimports | ||
| - govet | ||
| - misspell | ||
| - revive | ||
| - unused | ||
| - goconst | ||
| - forbidigo | ||
| - predeclared | ||
| linters-settings: | ||
| revive: | ||
| rules: | ||
| - name: confusing-naming | ||
| disabled: true | ||
| - name: exported | ||
| disabled: false | ||
| goconst: | ||
| min-len: 2 | ||
| min-occurrences: 10 | ||
| match-constant: true | ||
| ignore-strings: "metadata.+" | ||
| forbidigo: | ||
| forbid: | ||
| - p: ^*\.Sleep.*$ | ||
| msg: "No sleeps please use the appropriate polls and watch" | ||
| - p: ^fmt\.Print.*$ | ||
| msg: "No format prints, please testing or logrus packages" | ||
| version: "2" | ||
| run: | ||
| tests: false | ||
| timeout: 10m | ||
| issues: | ||
| exclude-dirs: | ||
| - pkg/generated/* | ||
| - clients/rancher/generated/* | ||
| exclude-files: | ||
| - ^*\.yaml$ | ||
| - ^*\.yml$ | ||
| exclude-generated: strict | ||
| linters: | ||
| default: none | ||
| enable: | ||
| - forbidigo | ||
| - goconst | ||
| - govet | ||
| - ineffassign | ||
| - misspell | ||
| - predeclared | ||
| - revive | ||
| - unused | ||
| settings: | ||
| forbidigo: | ||
| forbid: | ||
| - pattern: ^*\.Sleep.*$ | ||
| msg: No sleeps please use the appropriate polls and watch | ||
| - pattern: ^fmt\.Print.*$ | ||
| msg: No format prints, please testing or logrus packages | ||
| goconst: | ||
| match-constant: true | ||
| min-len: 2 | ||
| min-occurrences: 10 | ||
| ignore-string-values: | ||
| - metadata.+ | ||
| revive: | ||
| rules: | ||
| - name: confusing-naming | ||
| disabled: true | ||
| - name: exported | ||
| disabled: false | ||
| exclusions: | ||
| presets: | ||
| - comments | ||
| - common-false-positives | ||
| - legacy | ||
| - std-error-handling | ||
| paths: | ||
| - ^*\.yaml$ | ||
| - ^*\.yml$ | ||
| - pkg/generated/* | ||
| - clients/rancher/generated/* | ||
| - third_party$ | ||
| - builtin$ | ||
| - examples$ | ||
| formatters: | ||
| enable: | ||
| - goimports | ||
| exclusions: | ||
| paths: | ||
| - ^*\.yaml$ | ||
| - ^*\.yml$ | ||
| - pkg/generated/* | ||
| - clients/rancher/generated/* | ||
| - third_party$ | ||
| - builtin$ | ||
| - examples$ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this change intentional and why is it updated?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, intentional. The pkg/apis bump pulls in transitive deps (aks-operator, eks-operator, gke-operator, fleet, lasso, norman) that all require Go 1.25. The previously pinned golangci-lint v1.64.6 was built with Go 1.24 and can't parse Go 1.25 modules
CI was failing with the Go language version (go1.24) used to build golangci-lint is lower than the targeted Go version (1.25.0). v1.x has no Go 1.25 release (the project moved to v2 series). v2.5.0 is built with Go 1.25.1.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We want parity between shepherd and rancher/rancher, this PR already covers that parity, could you take a look at it? #536
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for flagging #536
A few things to consider:
#560 is a focused 5-file bump intentionally kept small to unblock the OIDC PR (#547), which Priya's already reviewed and approved pending the typed-wrangler rewrite that depends on v3.OIDCClientSpec.Scopes. #536 is a larger 408-file change (RKE1 removal) that's been in cross-team review for breaking changes since March, currently using a fork pin for pkg/apis (bhartigautam156/rancher/pkg/apis).
Would it make sense to land #560 as the focused dep bump (no behavior changes outside the bump itself) so OIDC can move forward, then handle the RKE1 removal on its own timeline in #536?