Fix elastic-agent-service Docker container entrypoint#5892
Merged
cmacknz merged 4 commits intoelastic:mainfrom Oct 30, 2024
Merged
Fix elastic-agent-service Docker container entrypoint#5892cmacknz merged 4 commits intoelastic:mainfrom
cmacknz merged 4 commits intoelastic:mainfrom
Conversation
The image will be deployed in cloud, but the runtime requirements are that of the standard Docker image.
cmacknz
added
Team:Elastic-Agent-Control-Plane
Contributor
|
Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane) |
Member
Author
|
Added both original reviewers from #5349 which introduced this image since Blake is currently out. |
dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl
Outdated
Show resolved
Hide resolved
dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl
Outdated
Show resolved
Hide resolved
dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl
Outdated
Show resolved
Hide resolved
pkoutsovasilis
approved these changes
Oct 30, 2024
Contributor
pkoutsovasilis
left a comment
pkoutsovasilis
left a comment
There was a problem hiding this comment.
in the original PR I did review the changes that affected the existing k8s integration tests. Full disclosure, I am not entirely sure why the the command and args had to change for the TestKubernetesAgentService but from what I can tell there are not needed. Thus LGTM 🙂
|
mergify bot
pushed a commit
that referenced
this pull request
Oct 30, 2024
* Stop treating the service image like cloud. The image will be deployed in cloud, but the runtime requirements are that of the standard Docker image. * Remove elastic-agent-service command customization. * Remove unnecessary 'or' (cherry picked from commit 0cdfef5)
mergify bot
pushed a commit
that referenced
this pull request
Oct 30, 2024
* Stop treating the service image like cloud. The image will be deployed in cloud, but the runtime requirements are that of the standard Docker image. * Remove elastic-agent-service command customization. * Remove unnecessary 'or' (cherry picked from commit 0cdfef5)
pierrehilbert
pushed a commit
that referenced
this pull request
Oct 31, 2024
* Stop treating the service image like cloud. The image will be deployed in cloud, but the runtime requirements are that of the standard Docker image. * Remove elastic-agent-service command customization. * Remove unnecessary 'or' (cherry picked from commit 0cdfef5) Co-authored-by: Craig MacKenzie <craig.mackenzie@elastic.co>
cmacknz
added a commit
that referenced
this pull request
Oct 31, 2024
* Stop treating the service image like cloud. The image will be deployed in cloud, but the runtime requirements are that of the standard Docker image. * Remove elastic-agent-service command customization. * Remove unnecessary 'or' (cherry picked from commit 0cdfef5) Co-authored-by: Craig MacKenzie <craig.mackenzie@elastic.co>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
The
elastic-agent-servicecontainer followed the template for theelastic-agent-cloudcontainer. This isn't quite correct, because while the service container will run exclusively in cloud it is otherwise meant to be used as a standard Elastic Agent docker container with the standard entrypoint.