Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ensure the mesh gateway configuration comes back in the api within each upstream #6093

Merged
merged 7 commits into from
Jul 12, 2019

Conversation

mkeeler
Copy link
Member

@mkeeler mkeeler commented Jul 8, 2019

Fixes #6085

• Fixes the ToAPI method on the Upstream to properly convert the MeshGatewayConfig so it doesn't get returned as empty.
• Fixes a service dump kind blocking issue that caused it not to wake up the watcher when a service of that kind was deleted (or its check/node were deleted)
• Fixes another issue that caused mesh gateways to be used even for dc local connections.

@mkeeler mkeeler added this to the 1.6.0-beta2 milestone Jul 8, 2019
@mkeeler mkeeler requested a review from a team July 8, 2019 19:01
}

// if the default mode
if meshGateway == structs.MeshGatewayModeDefault {
meshGateway = s.proxyCfg.MeshGateway.Mode
meshGateway = structs.MeshGatewayModeNone
Copy link
Member

Choose a reason for hiding this comment

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

Perhaps a test for this behavior you modified in the proxycfg package would be good.

Copy link
Member

@banks banks left a comment

Choose a reason for hiding this comment

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

Not totally sure, but I think if this new Kind index is necessary for delete correctness then there is one branch here still missing updates.

agent/consul/state/catalog.go Show resolved Hide resolved
agent/structs/connect_proxy_config.go Show resolved Hide resolved
Copy link
Member

@banks banks left a comment

Choose a reason for hiding this comment

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

Nice those tests look like a good way to validate this without lots more timing-sensitive code and elaborate mocking.

agent/proxycfg/state.go Outdated Show resolved Hide resolved
@mkeeler mkeeler force-pushed the bugfix/agent-api-upstream-gateway-config branch from 0bb6919 to 885646f Compare July 12, 2019 20:31
Copy link
Member

@rboyer rboyer left a comment

Choose a reason for hiding this comment

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

LGTM

@mkeeler mkeeler merged commit 4728329 into release/1-6 Jul 12, 2019
@mkeeler mkeeler deleted the bugfix/agent-api-upstream-gateway-config branch July 12, 2019 21:19
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