Skip to content

Backport of [NET-9097, NET-8174] Upgrade controller-runtime into release/1.1.x#3966

Merged
nathancoleman merged 2 commits intorelease/1.1.xfrom
backport/controller-runtime/normally-learning-whale
May 20, 2024
Merged

Backport of [NET-9097, NET-8174] Upgrade controller-runtime into release/1.1.x#3966
nathancoleman merged 2 commits intorelease/1.1.xfrom
backport/controller-runtime/normally-learning-whale

Conversation

@hc-github-team-consul-core
Copy link
Copy Markdown
Collaborator

@hc-github-team-consul-core hc-github-team-consul-core commented May 3, 2024

Backport

This PR is auto-generated from #3935 to be assessed for backporting due to the inclusion of the label backport/1.1.x.

The below text is copied from the body of the original PR.


Changes proposed in this PR

  • Upgrade controller-runtime to the version required by github.com/kubernetes-sigs/gateway-api@v1, to be consumed in a future PR. This version is v0.16.3 (code).
  • Update helm/v3, both to resolve a CVE and to reach a compatible set of dependencies

How I've tested this PR

  • 🤖 tests pass
  • Ran a basic consul setup on k8s using this branch

How I expect reviewers to test this PR

  • 🤖 tests pass

Checklist


Overview of commits

@hashicorp-cla-app
Copy link
Copy Markdown

hashicorp-cla-app bot commented May 3, 2024

CLA assistant check
All committers have signed the CLA.

…ase/1.2.x (#3967)

* Backport of [NET-9097, NET-8174] Upgrade controller-runtime into release/1.4.x (#3969)

* [NET-9097, NET-8174] Upgrade controller-runtime (#3935)

* Consume controller-runtime v0.16.3

This is the version required by gateway-api v1.0.0, which will be consumed in a future PR

* Reconcile breaking changes in controller-runtime

* Fix linter errors

* gofmt

* Update controller tests to handle new fake client requirements

* Update test assertion to handle changes in controller-runtime

* Restore incorrectly-removed flags

* Use a proper delete on the fake client since DeletionTimestamp is immutable

* Update enterprise tests to specify status subresources

* Update controller-runtime dependency for acceptance tests

* Explicitly inject decoder into webhooks

* Appease the linter

* Use SetupWithManager pattern from controllers for webhook setup

* Consume consistent version of k8s.io/client-go everywhere

* Upgrade related dependencies for CLI, including helm/v3

* Consume latest release of helm/v3

* changelog

* Inline function calls for testing

* Consume controller-runtime v0.16.5

---------

* Update uses of controller-runtime func that was removed

Co-Authored-By: Nathan Coleman <nathan.coleman@hashicorp.com>

* Restore toolchain version for acceptance module

* Restore toolchain version for cli module

Co-Authored-By: Nathan Coleman <nathan.coleman@hashicorp.com>
@nathancoleman nathancoleman force-pushed the backport/controller-runtime/normally-learning-whale branch from 279be71 to 1310f84 Compare May 20, 2024 15:05
@nathancoleman nathancoleman marked this pull request as ready for review May 20, 2024 16:04
@nathancoleman nathancoleman requested review from jm96441n and zalimeni and removed request for nathancoleman May 20, 2024 16:04
@nathancoleman nathancoleman enabled auto-merge (squash) May 20, 2024 16:16
@nathancoleman nathancoleman merged commit c1df177 into release/1.1.x May 20, 2024
@nathancoleman nathancoleman deleted the backport/controller-runtime/normally-learning-whale branch May 20, 2024 19:05
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