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

chore(deps): bump k8s.io/apimachinery from 0.26.10 to 0.30.2 #535

Merged
merged 13 commits into from
Jun 19, 2024

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Apr 18, 2024

Bumps k8s.io/apimachinery from 0.26.10 to 0.30.0.

Commits
  • 37988e5 Merge remote-tracking branch 'origin/master' into release-1.30
  • c857a38 Update x/net for CVE-2023-45288
  • 0407311 followup to allow special characters
  • 25164f7 Merge pull request #123435 from tallclair/apparmor-ga
  • cbfe0a1 Merge pull request #123758 from liggitt/protobump
  • 21d26b6 Bump github.com/golang/protobuf v1.5.4, google.golang.org/protobuf v1.33.0
  • 0c29f84 Merge pull request #123385 from HirazawaUi/allow-special-characters
  • 60d24f2 Merge pull request #123708 from p0lyn0mial/upstream-const-watchlist-bookmark-...
  • 513d23a apimachinery/meta/types.go: define InitialEventsAnnotationKey const
  • 67cb3a8 Merge pull request #123413 from seans3/tunneling-spdy-websockets
  • Additional commits viewable in compare view

Dependabot compatibility score

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

@dependabot dependabot bot added dependencies Pull requests that update a dependency file go Pull requests that update Go code labels Apr 18, 2024
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Apr 18, 2024
@dependabot dependabot bot force-pushed the dependabot/go_modules/k8s.io/apimachinery-0.30.0 branch from d954bff to 8ef272d Compare May 2, 2024 13:40
Bumps [k8s.io/apimachinery](https://github.com/kubernetes/apimachinery) from 0.26.10 to 0.30.0.
- [Commits](kubernetes/apimachinery@v0.26.10...v0.30.0)

---
updated-dependencies:
- dependency-name: k8s.io/apimachinery
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
@dependabot dependabot bot force-pushed the dependabot/go_modules/k8s.io/apimachinery-0.30.0 branch from 8ef272d to acf4646 Compare May 2, 2024 13:54
@k8s-ci-robot k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels May 2, 2024
export VER=v0.29; go get -u k8s.io/api@$VER k8s.io/client-go@$VER k8s.io/cloud-provider@$VER k8s.io/component-base@$VER k8s.io/apimachinery@$VER

Signed-off-by: GitHub <[email protected]>
@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels May 2, 2024
@displague
Copy link
Member

displague commented May 2, 2024

The signature of functions has changed in other ways in v0.30:

  Error: not enough arguments in call to app.NewCloudControllerManagerCommand
  	have (*"k8s.io/cloud-provider/options".CloudControllerManagerOptions, func(config *"k8s.io/cloud-provider/app/config".CompletedConfig) cloudprovider.Interface, map[string]"k8s.io/cloud-provider/app".ControllerInitFuncConstructor, "k8s.io/component-base/cli/flag".NamedFlagSets, <-chan struct{})
  	want (*"k8s.io/cloud-provider/options".CloudControllerManagerOptions, "k8s.io/cloud-provider/app".InitCloudFunc, map[string]"k8s.io/cloud-provider/app".ControllerInitFuncConstructor, map[string]string, "k8s.io/component-base/cli/flag".NamedFlagSets, <-chan struct{}) (typecheck)

This change doesn't seem to be represented in the sample provider: https://github.com/kubernetes/kubernetes/blob/master/staging/src/k8s.io/cloud-provider/sample/basic_main.go#L78-L82

trying to downgrade to 0.29.4 to see if we can get #499 with the other changes in this PR.

export VER=v0.29
go get -u k8s.io/{api,client-go,cloud-provider,component-base,apimachinery}@$VER 

@displague
Copy link
Member

Nope. Same error.

  Error: not enough arguments in call to app.NewCloudControllerManagerCommand
  	have (*"k8s.io/cloud-provider/options".CloudControllerManagerOptions, func(config *"k8s.io/cloud-provider/app/config".CompletedConfig) cloudprovider.Interface, map[string]"k8s.io/cloud-provider/app".ControllerInitFuncConstructor, "k8s.io/component-base/cli/flag".NamedFlagSets, <-chan struct{})
  	want (*"k8s.io/cloud-provider/options".CloudControllerManagerOptions, "k8s.io/cloud-provider/app".InitCloudFunc, map[string]"k8s.io/cloud-provider/app".ControllerInitFuncConstructor, map[string]string, "k8s.io/component-base/cli/flag".NamedFlagSets, <-chan struct{}) (typecheck)

Copy link
Contributor Author

dependabot bot commented on behalf of github May 16, 2024

A newer version of k8s.io/apimachinery exists, but since this PR has been edited by someone other than Dependabot I haven't updated it. You'll get a PR for the updated version as normal once this PR is merged.

@displague
Copy link
Member

displague commented Jun 19, 2024

Updating the PR to v0.30.2 via:

export VER=v0.30
go get -u k8s.io/{api,client-go,cloud-provider,component-base{,/metrics},apimachinery,apiserver/pkg/server}@$VER

export VER=v0.30
go get -u k8s.io/{api,client-go,cloud-provider,component-base,apimachinery}@$VER

Changes to NewCloudControllerManagerCommand parameters:
* using app.DefaultInitFuncConstructors directly since "routes" hasn't been part of the map. Other providers that don't provide routes are not impacted by this.
* added controllerAliases as part of the new signature

Signed-off-by: GitHub <[email protected]>
@displague displague changed the title chore(deps): bump k8s.io/apimachinery from 0.26.10 to 0.30.0 chore(deps): bump k8s.io/apimachinery from 0.26.10 to 0.30.2 Jun 19, 2024
Copy link
Member

@cprivitere cprivitere left a comment

Choose a reason for hiding this comment

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

/lgtm
/approved

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 19, 2024
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cprivitere, dependabot[bot]

The full list of commands accepted by this bot can be found here.

The pull request process is described 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 the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 19, 2024
@k8s-ci-robot k8s-ci-robot merged commit d914d96 into main Jun 19, 2024
6 checks passed
@k8s-ci-robot k8s-ci-robot deleted the dependabot/go_modules/k8s.io/apimachinery-0.30.0 branch June 19, 2024 20:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. dependencies Pull requests that update a dependency file go Pull requests that update Go code lgtm "Looks good to me", indicates that a PR is ready to be merged. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants