consul/connect: Avoid assumption of parent service when filtering connect proxies #10872
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
shoenig
force-pushed
the
b-cc-regex-checkids
branch
from
ad07526
to
28bbe8a
Compare
shoenig
force-pushed
the
b-cc-regex-checkids
branch
from
28bbe8a
to
86283ad
Compare
tgross
approved these changes
Jul 8, 2021
| _, ok := services[id[:len(id)-len(sidecarSuffix)]] | ||
| return ok | ||
| var ( | ||
| sidecarProxyCheckRe = regexp.MustCompile(`service:_nomad-.+-sidecar-proxy(:[\d]+)?`) |
There was a problem hiding this comment.
I'm not 100% sure how strict this has to be, but I was able to get this regex to match on some unexpected inputs. Maybe this should this have anchors at the start and end? Ex. https://play.golang.org/p/k8UFSZz3E6g
There was a problem hiding this comment.
Good catch! Added regex and appended those test cases
Merged
|
I'm going to lock this pull request because it has been closed for 120 days ⏳. This helps our maintainers find and focus on the active contributions. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR uses regex-based matching for sidecar proxy services and checks when syncing
with Consul. Previously we would check if the parent of the sidecar was still being
tracked in Nomad. This is a false invariant - one which we must not depend when we
make #10845 work.
Fixes #10843