Skip to content

Backport of Consul API Gateway, Add Tolerations support into release/0.49.x#1667

Merged
sarahalsmiller merged 1 commit intorelease/0.49.xfrom
backport/consul-api-gateway-add-tolerations-support/hardly-enormous-drum
Nov 4, 2022
Merged

Backport of Consul API Gateway, Add Tolerations support into release/0.49.x#1667
sarahalsmiller merged 1 commit intorelease/0.49.xfrom
backport/consul-api-gateway-add-tolerations-support/hardly-enormous-drum

Conversation

@hc-github-team-consul-ecosystem
Copy link
Copy Markdown
Contributor

Backport

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

WARNING automatic cherry-pick of commits failed. Commits will require human attention.

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:

  • At request of customer, add support for configuring tolerations to consul api gateway controller and gateway pods

How I've tested this PR:

How I expect reviewers to test this PR:

Checklist:

  • Tests added
  • [ X ] 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-ecosystem hc-github-team-consul-ecosystem force-pushed the backport/consul-api-gateway-add-tolerations-support/hardly-enormous-drum branch from ce8bcb9 to bf83493 Compare November 1, 2022 20:40
@david-yu
Copy link
Copy Markdown
Contributor

david-yu commented Nov 1, 2022

cc @sarahalsmiller which needs to resolved to be back ported to 0.49.x

@nathancoleman
Copy link
Copy Markdown
Member

Resolving conflicts here in a moment...

…tions-support

Consul API Gateway, Add Tolerations support
@nathancoleman nathancoleman force-pushed the backport/consul-api-gateway-add-tolerations-support/hardly-enormous-drum branch from bf83493 to 9629d8f Compare November 4, 2022 15:09
@nathancoleman nathancoleman marked this pull request as ready for review November 4, 2022 15:10
@nathancoleman
Copy link
Copy Markdown
Member

nathancoleman commented Nov 4, 2022

@sarahalsmiller @david-yu I've resolved merge conflicts here. Please review

Copy link
Copy Markdown
Contributor

@david-yu david-yu left a comment

Choose a reason for hiding this comment

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

Looks good, assuming tests pass, please merge. Thank you.

@sarahalsmiller sarahalsmiller merged commit 7b98f90 into release/0.49.x Nov 4, 2022
@sarahalsmiller sarahalsmiller deleted the backport/consul-api-gateway-add-tolerations-support/hardly-enormous-drum branch November 4, 2022 17:05
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.

4 participants