Add externalServers.skipServerWatch to helm for working with load balancers #1686
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
- add CONSUL_SKIP_SERVER_WATCH env variable to _helpers.tpl - bats tests in connect-inject-deployment to validate that env variable works for skip server watch - add externalServers.skipServerWatch to values.yaml - read env variable in as a flag in flags/consul and unit tests.
check that server-watch-disabled is set with connect injector
curtbushko
force-pushed
the
curtbushko/skip-server-watch
branch
from
f80ce55 to
94c5e1e
Compare
curtbushko
commented
Nov 8, 2022
| @@ -8,6 +8,7 @@ | |||
| {{- $serverEnabled := (or (and (ne (.Values.server.enabled | toString) "-") .Values.server.enabled) (and (eq (.Values.server.enabled | toString) "-") .Values.global.enabled)) -}} | |||
| {{- $serverExposeServiceEnabled := (or (and (ne (.Values.server.exposeService.enabled | toString) "-") .Values.server.exposeService.enabled) (and (eq (.Values.server.exposeService.enabled | toString) "-") .Values.global.adminPartitions.enabled)) -}} | |||
| {{- if and .Values.externalServers.enabled (not .Values.externalServers.hosts) }}{{ fail "externalServers.hosts must be set if externalServers.enabled is true" }}{{ end -}} | |||
| {{- if and .Values.externalServers.skipServerWatch (not .Values.externalServers.enabled) }}{{ fail "externalServers.enabled must be set if externalServers.skipServerWatch is true" }}{{ end -}} | |||
There was a problem hiding this comment.
Putting the fail condition here so that it is obvious that it pairs with the checks in connect-inject-deployment.bats.
A similar thing is done for externalServers.hosts and _helpers.tpl. The checks are here in connect-inject-deployment.yaml.
thisisnotashwin
approved these changes
Nov 9, 2022
| @@ -355,6 +355,10 @@ Consul server environment variables for consul-k8s commands. | |||
| value: {{ .Values.externalServers.tlsServerName }} | |||
| {{- end }} | |||
| {{- end }} | |||
| {{- if and .Values.externalServers.enabled .Values.externalServers.skipServerWatch }} | |||
| - name: CONSUL_SKIP_SERVER_WATCH | |||
| value: "true" | |||
There was a problem hiding this comment.
it's a nit but can we unqoute the "true"
Co-authored-by: Iryna Shustava <ishustava@users.noreply.github.com>
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.
Changes proposed in this PR:
externalServers.skipServerWatchexternalServers.enabledis also set whenexternalServers.skipServerWatch=truein connect-inject-deployment.yaml-server-watch-disabled=trueflagHow I've tested this PR:
How I expect reviewers to test this PR:
👀
Checklist: