Use docker-entrypoint when running consul #590
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
Previously we were executing consul directly via /bin/consul and we were using the Kubernetes `command` key which overrides the default Docker ENTRYPOINT. This had no issues, however I propose that it's best to execute via the entrypoint so we keep things consistent with how the Docker image was supposed to be run. This is also consistent with Vault's Helm chart. If you step through the entrypoint script, nothing actually changes with how we execute consul because we don't trigger any of the `if` statements. So there is no real effect right now. In order to support using the entrypoint script, we need to disable part of the script that attempts to change the ownership of the /consul directory because the ownership is already set via Kube. Entrypoint script is here: https://github.com/hashicorp/docker-consul/blob/master/0.X/docker-entrypoint.sh
Test now uses map/select instead of using fixed indices.
lkysow
changed the title
1 task
lkysow
requested review from
a team,
ndhanushkodi and
t-eckert
and removed request for
a team
t-eckert
approved these changes
Aug 10, 2021
CHANGELOG.md
Outdated
| @@ -2,6 +2,7 @@ | |||
|
|
|||
| IMPROVEMENTS: | |||
| * Add flags `-log-level`, `-log-json` to all subcommands to control log level and json formatting. [[GH-523](https://github.com/hashicorp/consul-k8s/pull/523)] | |||
| * Execute consul clients and servers using the docker entrypoint to keep consistent. [[GH-590](https://github.com/hashicorp/consul-k8s/pull/590)] | |||
There was a problem hiding this comment.
Nit: "Consul" instead of "consul" and "Docker" instead of "docker" to be consistent with previous Changelog items.
ndhanushkodi
approved these changes
Aug 10, 2021
CHANGELOG.md
Outdated
| @@ -2,6 +2,7 @@ | |||
|
|
|||
| IMPROVEMENTS: | |||
| * Add flags `-log-level`, `-log-json` to all subcommands to control log level and json formatting. [[GH-523](https://github.com/hashicorp/consul-k8s/pull/523)] | |||
| * Execute consul clients and servers using the docker entrypoint to keep consistent. [[GH-590](https://github.com/hashicorp/consul-k8s/pull/590)] | |||
There was a problem hiding this comment.
Suggested change
| * Execute consul clients and servers using the docker entrypoint to keep consistent. [[GH-590](https://github.com/hashicorp/consul-k8s/pull/590)] | |
| * Execute consul clients and servers using the docker entrypoint for consistency. [[GH-590](https://github.com/hashicorp/consul-k8s/pull/590)] |
lkysow
commented
Aug 11, 2021
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.
Previously we were executing consul directly via /bin/consul and we were
using the Kubernetes
commandkey which overrides the default DockerENTRYPOINT.
This had no issues, however I propose that it's best to execute via the
entrypoint so we keep things consistent with how the Docker image was
supposed to be run. This is also consistent with Vault's Helm chart. If
you step through the entrypoint script, nothing actually changes with
how we execute consul because we don't trigger any of the
ifstatements. So there is no real effect right now.
In order to support using the entrypoint script, we need to disable part of the
script that attempts to change the ownership of the /consul directory
because the ownership is already set via Kube. To disable this we set the
DISABLE_PERM_MGMTenv var totrue.Entrypoint script is here: https://github.com/hashicorp/docker-consul/blob/master/0.X/docker-entrypoint.sh
How I've tested this PR:
How I expect reviewers to test this PR:
Checklist: