Skip to content

Backport of add HOST_IP to mesh-gateway into release/1.0.x#2128

Merged
DanStough merged 2 commits intorelease/1.0.xfrom
backport/add-host-ip-to-mesh-gateway-deployment/exactly-fond-tarpon
May 12, 2023
Merged

Backport of add HOST_IP to mesh-gateway into release/1.0.x#2128
DanStough merged 2 commits intorelease/1.0.xfrom
backport/add-host-ip-to-mesh-gateway-deployment/exactly-fond-tarpon

Conversation

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

Backport

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

How I've tested this PR:

  • Applied the change locally and verified that the pod manifest reflect the updated environment configuration

How I expect reviewers to test this PR:

  • Apply the changes are verify that the pod manifests reflect the updated environment configuration

Note too sure the best way to add a test for this. Suggestions would be greatly appreciated.

Checklist:

  • Tests added
  • CHANGELOG entry added

    HashiCorp engineers only, community PRs should not add a changelog entry.
    Entries should use present tense (e.g. Add support for...)


Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/add-host-ip-to-mesh-gateway-deployment/exactly-fond-tarpon branch from 2da9f03 to a50bafe Compare May 12, 2023 19:44
@DanStough DanStough marked this pull request as ready for review May 12, 2023 21:29
@DanStough DanStough merged commit ec7b0ef into release/1.0.x May 12, 2023
@DanStough DanStough deleted the backport/add-host-ip-to-mesh-gateway-deployment/exactly-fond-tarpon branch May 12, 2023 22:27
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