Skip to content

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

Merged
roncodingenthusiast merged 3 commits intorelease/1.4.xfrom
backport/controller-runtime/heavily-curious-camel
May 14, 2024
Merged

Backport of [NET-9097, NET-8174] Upgrade controller-runtime into release/1.4.x#3969
roncodingenthusiast merged 3 commits intorelease/1.4.xfrom
backport/controller-runtime/heavily-curious-camel

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.4.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

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/controller-runtime/heavily-curious-camel branch from 81849ec to 32c6967 Compare May 3, 2024 20:55
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/controller-runtime/heavily-curious-camel branch from 32c6967 to 81849ec Compare May 3, 2024 20:55
* 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

---------

Co-authored-by: Ronald Ekambi <ronekambi@gmail.com>
@nathancoleman nathancoleman force-pushed the backport/controller-runtime/heavily-curious-camel branch from 32c6967 to 7763e64 Compare May 6, 2024 19:05
@nathancoleman nathancoleman marked this pull request as ready for review May 6, 2024 19:29
@roncodingenthusiast roncodingenthusiast enabled auto-merge (squash) May 14, 2024 20:36
@roncodingenthusiast roncodingenthusiast merged commit cc35896 into release/1.4.x May 14, 2024
@roncodingenthusiast roncodingenthusiast deleted the backport/controller-runtime/heavily-curious-camel branch May 14, 2024 21:04
nathancoleman added a commit that referenced this pull request May 16, 2024
…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 added a commit that referenced this pull request May 16, 2024
…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 added a commit that referenced this pull request May 17, 2024
…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 added a commit that referenced this pull request May 17, 2024
…ase/1.3.x (#3968)

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>
nathancoleman added a commit that referenced this pull request May 17, 2024
…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 added a commit that referenced this pull request May 17, 2024
…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 added a commit that referenced this pull request May 17, 2024
…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 added a commit that referenced this pull request May 20, 2024
…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 added a commit that referenced this pull request May 20, 2024
…ase/1.1.x (#3966)

Backport of [NET-9097, NET-8174] Upgrade controller-runtime into release/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



* Restore toolchain version for acceptance module

* Restore toolchain version for cli module

Co-authored-by: Nathan Coleman <nathan.coleman@hashicorp.com>
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.

3 participants