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 remove catalogv2 implementation and tests into release/1.5.x #4400

Draft
wants to merge 1 commit into
base: release/1.5.x
Choose a base branch
from

Conversation

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

Backport

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

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

The person who merged in the original PR is:
@rboyer
This person should manually cherry-pick the original PR into a new backport PR,
and close this one when the manual backport PR is merged in.

merge conflict error: POST https://api.github.com/repos/hashicorp/consul-k8s/merges: 409 Merge conflict []

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


Changes proposed in this PR

  • Remove all direct plumbing related to the resource-apis and v2tenancy experiments
  • Remove all remaining dead code pertaining to the remainder of Consul resources (all experimental)
  • Remove all tests of the above

https://hashicorp.atlassian.net/browse/NET-9089


Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/rboyer/remove-catalogv2-impl/painfully-infinite-sawfish branch from 30bd536 to 2a4d375 Compare October 18, 2024 02:25
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.

2 participants