Fix auto-inject config when TLS is disabled #2246
Merged
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
Signed-off-by: Kevin Lingerfelt <kl@buoyant.io>
klingerf
commented
Feb 11, 2019
| @@ -1,94 +0,0 @@ | |||
| { | |||
There was a problem hiding this comment.
This text fixture file was not being used anywhere, so I'm removing it.
| } | ||
|
|
||
| // NewWebhookConfig returns a new instance of initiator. | ||
| func NewWebhookConfig(client kubernetes.Interface, controllerNamespace, webhookServiceName string, noInitContainer bool, rootCA *tls.CA) (*WebhookConfig, error) { | ||
| func NewWebhookConfig(client kubernetes.Interface, controllerNamespace, webhookServiceName string, rootCA *tls.CA) (*WebhookConfig, error) { |
There was a problem hiding this comment.
The webhook config template does not use the value of noInitContainer when rendering the template, so it doesn't need to be passed into this func or set on the WebhookConfig struct.
alpeb
approved these changes
Feb 11, 2019
There was a problem hiding this comment.
Looks good to me. Good catch on no-init-container non-usage 👍
FYI, I tried reproducing the failed healthcheck, but couldn't. I first thought the recently introduced change in the proxy for disabling TLS-to-plaintext fallback would make this fail, but it doesn't:
linkerd/linkerd2-proxy@3336918
This was referenced Feb 11, 2019
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.
As of #2163, TLS is no longer required when installing linkerd with automatic proxy injection, but the injected linkerd configs were still referencing TLS volumes. This change updates the proxy-injector to only include those volumes when the control plane is installed with auto-inject and TLS enabled.
Fixes #2236.