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

vendor: bump github.com/operator-framework/operator-sdk from 1.16.0 to 1.17.0 #115

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Feb 7, 2022

Bumps github.com/operator-framework/operator-sdk from 1.16.0 to 1.17.0.

Release notes

Sourced from github.com/operator-framework/operator-sdk's releases.

v1.17.0

Additions

  • Now operator-sdk bundle validate also ensures that the alm-examples annotation has a valid JSON (More info) Introduction done by upgrading operator-framework/api from the commit 54878ea280f7c7402549dae568916dfb330b9262 to the release v0.11.1. (#5495)
  • Added the hybrid.helm.sdk.operatorframework.io/v1-alpha plugin, which scaffolds a hybrid helm based operator. For more details on the plugin, please refer https://github.com/operator-framework/helm-operator-plugins/blob/main/docs/tutorial.md. This plugin is alpha and subject to breaking changes. (#5504)
  • Add resource requests and limits to kube-rbac-proxy. (#5505)

Changes

  • (go/v3) upgrade go version from 1.16 to 1.17 and the following dependencies: - upgrade controller-runtime from 0.10.0 to 0.11.0 - k8s from 1.22 to 1.23 - controller-gen from v0.0.7 to v0.8.0. (#5505)
  • The debug log level for the sidecar container kube-rbac-proxy was reduced from 10 to 0. (#5505)
Commits

Dependabot compatibility score

You can trigger a rebase of this PR 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 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 the vendor Pull requests that update vendored dependencies label Feb 7, 2022
yati1998
yati1998 previously approved these changes Feb 8, 2022
@Rakshith-R
Copy link
Member

@Mergifyio rebase

@Rakshith-R
Copy link
Member

@dependabot recreate

@mergify
Copy link

mergify bot commented Feb 8, 2022

rebase

❌ Base branch update has failed

Git reported the following error:

Rebasing (1/1)
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging vendor/modules.txt
CONFLICT (content): Merge conflict in vendor/modules.txt
error: could not apply ffee8e0... vendor: bump github.com/operator-framework/operator-sdk
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply ffee8e0... vendor: bump github.com/operator-framework/operator-sdk

err-code: 52657

Bumps [github.com/operator-framework/operator-sdk](https://github.com/operator-framework/operator-sdk) from 1.16.0 to 1.17.0.
- [Release notes](https://github.com/operator-framework/operator-sdk/releases)
- [Changelog](https://github.com/operator-framework/operator-sdk/blob/master/.goreleaser.yml)
- [Commits](operator-framework/operator-sdk@v1.16.0...v1.17.0)

---
updated-dependencies:
- dependency-name: github.com/operator-framework/operator-sdk
  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/github.com/operator-framework/operator-sdk-1.17.0 branch from ffee8e0 to cb997ee Compare February 8, 2022 04:58
@mergify mergify bot dismissed yati1998’s stale review February 8, 2022 04:58

Pull request has been modified.

It seems the package github.com/mikefarah/yaml/v2 is used indirectly,
and causes issues now. The package should use gopkg.in/yaml.v2 for
importing. This has been replaced/excluded in go.mod so that everything
builds again.

Signed-off-by: Niels de Vos <[email protected]>
@nixpanic nixpanic self-assigned this Feb 8, 2022
@nixpanic nixpanic requested a review from yati1998 February 8, 2022 10:10
@nixpanic
Copy link
Collaborator

nixpanic commented Feb 8, 2022

@Rakshith-R @yati1998 updated with additional commits to resolve conflicts. Also included an update to Kubernetes API 0.23.3 (was 0.23.1, but replaced for operator-sdk dependencies).

Copy link
Member

@Rakshith-R Rakshith-R left a comment

Choose a reason for hiding this comment

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

Thanks!

@Rakshith-R Rakshith-R requested a review from a team February 8, 2022 11:58
@mergify mergify bot merged commit c804b5e into main Feb 9, 2022
@mergify mergify bot deleted the dependabot/go_modules/github.com/operator-framework/operator-sdk-1.17.0 branch February 9, 2022 09:06
nixpanic pushed a commit to nixpanic/kubernetes-csi-addons that referenced this pull request Mar 4, 2024
Syncing latest changes from upstream main for kubernetes-csi-addons
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
vendor Pull requests that update vendored dependencies
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants