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

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

Merged

Conversation

hc-github-team-consul-core
Copy link
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.3.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

Copy link

hashicorp-cla-app bot commented May 3, 2024

CLA assistant check
All committers have signed the CLA.

@nathancoleman nathancoleman force-pushed the backport/controller-runtime/physically-apt-clam branch from 199f012 to 8b178ed Compare May 6, 2024 19:46
@nathancoleman nathancoleman marked this pull request as ready for review May 6, 2024 20:01
@nathancoleman nathancoleman force-pushed the backport/controller-runtime/physically-apt-clam branch from 9f8cca6 to 10bf7f1 Compare May 16, 2024 19:52
…ase/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>
@nathancoleman nathancoleman force-pushed the backport/controller-runtime/physically-apt-clam branch from abbf1b8 to 9935469 Compare May 16, 2024 21:45
Copy link
Member

@zalimeni zalimeni left a comment

Choose a reason for hiding this comment

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

LGTM, seems to have parity w/ the original and go mod tidy looks clean

@nathancoleman nathancoleman merged commit 3f85513 into release/1.3.x May 17, 2024
50 checks passed
@nathancoleman nathancoleman deleted the backport/controller-runtime/physically-apt-clam branch May 17, 2024 18:28
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.

None yet

3 participants