hashicorp / consul-k8s

First-class support for Consul Service Mesh on Kubernetes
https://www.consul.io/docs/k8s
Mozilla Public License 2.0
668 stars 321 forks source link

Backport of Fixes tolerations not working into release/1.6.x #4361

Closed hc-github-team-consul-core closed 3 weeks ago

hc-github-team-consul-core commented 4 weeks ago

Backport

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

:rotating_light:

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: @missylbytes 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: unable to process merge commit: "0a6baf3a9f66c44cb73c7100ba57f9a384fe2aae", automatic backport requires rebase workflow

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


Changes proposed in this PR

How I've tested this PR

How I expect reviewers to test this PR

Same as above

Checklist


Overview of commits - f6772336cb3960530465564206fbe433bc7658b0 - f501b955b939a5301a95cc4eb0ea059936941a41 - 44fed44d2789aea88c688eddcc49c502797fe53b - f8d0bc64e6333a3e6fca41b99c6e6a6ac09cbfb6 - ae82e6cd3f12b361be0bb323aed6eb8a1753c4b2 - d90cc9382c91955e61ecc0d3d335f8d5f3602dda - ef58d91c9b92c6db72e99dbeb50ca369bfa2989e - 0a6baf3a9f66c44cb73c7100ba57f9a384fe2aae - 9b6349454d010a7e50dff9b3a204d0019d333367 - 4024d004b884446b652901a26b433dee776fda83 - e22efb746291d411ea0d1f9509a4e3608cf2982a - 50cae96a0c0804f4db1d19e373151e3915162795 - d671aeca12939fd4db7d956b5e65e279ce5fe642 - a89016d6a244926cc48c222a491cf904523b21b4 - 59fdd83caa672d23bdadd8121f66afef64324332 - c0c93b1d33531dc182279ea43e588030338d20a8 - e52f94c47eb75a77d1a556d8b92276084ca9d44c