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.

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

k8s 1.30 dependencies update #224

Merged
merged 4 commits into from
Jun 11, 2024
Merged

Conversation

vardhaman22
Copy link
Contributor

@vardhaman22 vardhaman22 commented Jun 4, 2024

issue: rancher/rancher#45332

  • updated wrangler from v2 to v3
  • bumped norman and apiserver
  • bumped dynamiclistener to v0.6.0-rc1
  • bumped k8s dependencies to v0.30.1
  • bumped golangci lint to v1.59.0 in the workflow.
  • removed client-go rancher fork replace statement since all the fixes are included in upstream for client-go [v1.29] Add k8s v1.29 support  client-go#11 (comment) upstreamPR

@vardhaman22 vardhaman22 marked this pull request as ready for review June 4, 2024 19:20
@vardhaman22 vardhaman22 requested a review from a team as a code owner June 4, 2024 19:20
@vardhaman22 vardhaman22 requested a review from a team June 4, 2024 19:20

replace (
github.com/crewjam/saml => github.com/rancher/saml v0.2.0
github.com/knative/pkg => github.com/rancher/pkg v0.0.0-20181214184433-b04c0947ad2f
github.com/matryer/moq => github.com/rancher/moq v0.0.0-20190404221404-ee5226d43009
k8s.io/client-go => github.com/rancher/client-go v1.29.3-rancher1
Copy link
Contributor

Choose a reason for hiding this comment

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

Are you sure that we don't need the changes from the client-go fork in steve?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

was about to update the PR comment...it was discussed in PR comment : rancher/client-go#11 (comment)
so with k8s 0.30 client go all fixes have gone into upstream.

Copy link
Contributor

Choose a reason for hiding this comment

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

Thanks, I'll leave this thread open so that other reviewers can see it easily, but if all the fixes are upstream then that's a good change.

Copy link
Member

Choose a reason for hiding this comment

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

https://github.com/rancher/security-team/issues/349#issue-1820307873 has more context on why our custom changes are no longer required.

@vardhaman22 vardhaman22 merged commit d0f58fc into rancher:master Jun 11, 2024
1 check passed
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.

4 participants