Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support to use wolfi Elastic Agent image starting in 8.16.0-SNAPSHOT #2038

Merged
merged 13 commits into from
Aug 29, 2024
Merged

Add support to use wolfi Elastic Agent image starting in 8.16.0-SNAPSHOT #2038

merged 13 commits into from
Aug 29, 2024

Conversation

mrodm
Copy link
Contributor

@mrodm mrodm commented Aug 26, 2024 •
edited
Loading

Relates elastic/elastic-agent#5062

Use wolfi docker images for Elastic Agent starting with 8.16.0 stack version.

This behaviour could be disabled by defining the environment variable: ELASTIC_PACKAGE_DISABLE_ELASTIC_AGENT_WOLFI

Examples:

# Run 8.16.0-SNAPSHOT with wolfi images
elastic-package stack up -v -d --version 8.16.0-SNAPSHOT
ELASTIC_PACKAGE_DISABLE_ELASTIC_AGENT_WOLFI=false elastic-package stack up -v -d --version 8.16.0-SNAPSHOT

# Run 8.16.0-SNAPSHTO with ubuntu images
ELASTIC_PACKAGE_DISABLE_ELASTIC_AGENT_WOLFI=true elastic-package stack up -v -d --version 8.16.0-SNAPSHOT

# Previous stack versions would keep using the same docker images as before
elastic-package stack up -v -d --version 8.15.0
elastic-package stack up -v -d --version 7.15.0

Build using wolfi images (failing since that docker image is not available yet):

Build disabling wolfi images:

@mrodm mrodm self-assigned this Aug 26, 2024
mrodm
mrodm commented Aug 26, 2024
View reviewed changes
internal/install/application_configuration.go
stackVersion820 = "8.2.0-SNAPSHOT"
stackVersion715 = "7.15.0-SNAPSHOT"
stackVersion820 = "8.2.0-SNAPSHOT"
stackVersion8160 = "8.16.0-00000000-SNAPSHOT"
Copy link
Contributor Author

@mrodm mrodm Aug 26, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using 8.16.0-SNAPSHOT here as version did not change the docker image used for 8.16.0-21bba6f5-SNAPSHOT. So, this change is also applied for the Makefile target stack-command-8x.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we can add a comment mentioning this. Or set it to 8.15.999.

I guess we didn't have the same problem with the snapshots above because we were not using tagged versions, right?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Exactly, previously tests were using SNAPSHOT versions without the commit in the prerelease tag.

I'll add a comment 👍

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added comment in 094f898

@mrodm mrodm requested a review from a team August 27, 2024 08:37
jsoriano
jsoriano reviewed Aug 27, 2024
View reviewed changes
Copy link
Member

@jsoriano jsoriano left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, but before merging this, we need the overrides for the packages that need the complete images, right?

And maybe we need also an environment variable, or some way to disable wolfi images in case it breaks something in CI before it is GA.

internal/install/application_configuration.go
stackVersion820 = "8.2.0-SNAPSHOT"
stackVersion715 = "7.15.0-SNAPSHOT"
stackVersion820 = "8.2.0-SNAPSHOT"
stackVersion8160 = "8.16.0-00000000-SNAPSHOT"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we can add a comment mentioning this. Or set it to 8.15.999.

I guess we didn't have the same problem with the snapshots above because we were not using tagged versions, right?

@mrodm
Copy link
Contributor Author

mrodm commented Aug 27, 2024 •
edited
Loading

And maybe we need also an environment variable, or some way to disable wolfi images in case it breaks something in CI before it is GA.

Maybe it could be used the support added here to use another docker image: elastic/integrations#10885

But, packages that are tested with stack versions older than 8.2.0 would require a different docker image 🤔

I'll check to add a new environment variable to skip this wolfi image and update also the integrations PR.

@mrodm mrodm mentioned this pull request Aug 27, 2024
Closed
2 tasks
@mrodm mrodm changed the title Use wolfi image from 8.16.0-SNAPSHOT Use wolfi Elastic Agent image starting in 8.16.0-SNAPSHOT Aug 27, 2024
@mrodm mrodm marked this pull request as ready for review August 27, 2024 16:20
@mrodm mrodm requested a review from jsoriano August 27, 2024 16:20
jsoriano
jsoriano approved these changes Aug 28, 2024
View reviewed changes
Copy link
Member

@jsoriano jsoriano left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, but we need to wait for the image to be available, or disable this by default by now.

internal/install/application_configuration.go

disableWolfiImages := false
valueEnv, ok := os.LookupEnv(disableElasticAgentWolfiEnvVar)
if ok && strings.ToLower(valueEnv) != "false" {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perhaps we should default to true till the image is available if we want to merge this. Wdyt?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, I'll push the changes to revert the condition.
Once the image is available I'll create a follow-up PR.

@mrodm mrodm mentioned this pull request Aug 28, 2024
Merged
3 tasks
@mrodm
Copy link
Contributor Author

mrodm commented Aug 28, 2024

/test

@mrodm mrodm changed the title Use wolfi Elastic Agent image starting in 8.16.0-SNAPSHOT Add support to use wolfi Elastic Agent image starting in 8.16.0-SNAPSHOT Aug 28, 2024
@mrodm mrodm requested a review from jsoriano August 28, 2024 16:06
@mrodm mrodm mentioned this pull request Aug 28, 2024
Closed
@jsoriano jsoriano mentioned this pull request Aug 28, 2024
Merged
@elasticmachine
Copy link
Collaborator

💚 Build Succeeded

History

cc @mrodm

@mrodm mrodm merged commit 3131065 into elastic:main Aug 29, 2024
3 checks passed
@mrodm mrodm deleted the add-elastic-agent-wolfi branch August 29, 2024 09:34
@mrodm mrodm mentioned this pull request Sep 20, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jsoriano jsoriano jsoriano approved these changes

Assignees

@mrodm mrodm

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@mrodm @elasticmachine @jsoriano