NET-10480 - fix setting namespace and partition setting in dns-proxy mode #593
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
jmurret
added
the
pr/no-changelog
jmurret
commented
Jul 22, 2024
| @@ -27,9 +27,8 @@ const ( | |||
| ) | |||
|
|
|||
| // bootstrapConfig generates the Envoy bootstrap config in JSON format. | |||
| func (cdp *ConsulDataplane) bootstrapConfig(ctx context.Context) (*bootstrap.BootstrapConfig, []byte, error) { | |||
| func (cdp *ConsulDataplane) getBootstrapParams(ctx context.Context) (*pbdataplane.GetEnvoyBootstrapParamsResponse, error) { | |||
There was a problem hiding this comment.
dns proxy requires bootstrap params to set the namespace and partition.....but it does not require the bootstrap config itself. So we are splitting this into two functions, so that startDNSProxy() can get require bootstrap params in its signature rather than just assuming it is already set on the struct.
jmurret
commented
Jul 22, 2024
jmurret
commented
Jul 22, 2024
|
|
||
| // bootstrapConfig generates the Envoy bootstrap config in JSON format. | ||
| func (cdp *ConsulDataplane) bootstrapConfig( | ||
| bootstrapParams *pbdataplane.GetEnvoyBootstrapParamsResponse) (*bootstrap.BootstrapConfig, []byte, error) { |
There was a problem hiding this comment.
A prior call will already have gotten bootstrap params for this call as well as startDNSProxy()
jmurret
commented
Jul 22, 2024
jmurret
changed the title
1 task
jmurret
changed the title
1 task
zalimeni
approved these changes
Jul 29, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 fixes how namespace and partition get set when in dns-proxy mode. The prior attempt at this moved starting the DNS above starting envoy. What was not clear was that starting envoy set
resolvedProxyConfigin state so it was not set when DNS started and dns-proxy always started with the default namespace and partition. In the process, i also got rid of using state to pass parameters and just used the function signature to have the appropriate parameters.