Skip to content

Backport of Net 9069/fix local brokerage into release/1.4.x#3954

Merged
xwa153 merged 2 commits intorelease/1.4.xfrom
backport/NET-9069/fix-local-brokerage/widely-divine-yeti
Apr 25, 2024
Merged

Backport of Net 9069/fix local brokerage into release/1.4.x#3954
xwa153 merged 2 commits intorelease/1.4.xfrom
backport/NET-9069/fix-local-brokerage/widely-divine-yeti

Conversation

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

Backport

This PR is auto-generated from #3948 to be assessed for backporting due to the inclusion of the label backport/1.4.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:
@wangxinyi7
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

I tried several different approaches:

  • script to copy
    • pros: automated
    • cons:
      • need to clean up LICENSE file
      • make maintenance harder
  • Use parent dir as build-context
    • Can not load parent context
  • copy license file directly to control plane
    • LICENSE is rare to change
    • even when needed, it's very easy to copy and replace

The ending story is to just make another copy of LICENSE to control plane.


Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/NET-9069/fix-local-brokerage/widely-divine-yeti branch from 806a8f6 to 009c8e3 Compare April 25, 2024 05:51
@xwa153 xwa153 marked this pull request as ready for review April 25, 2024 05:53
@xwa153 xwa153 merged commit 855e081 into release/1.4.x Apr 25, 2024
@xwa153 xwa153 deleted the backport/NET-9069/fix-local-brokerage/widely-divine-yeti branch April 25, 2024 14:17
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