Skip to content

Add cloud-defend to agent container images #11450

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
Open
wants to merge 10 commits into
base: main
Choose a base branch
from
Open

Add cloud-defend to agent container images #11450

wants to merge 10 commits into from
+109 −5

Conversation

@mjwolf
Copy link
Contributor

@mjwolf mjwolf commented Nov 26, 2025

What does this PR do?

Add cloud-defend to Agent container image artifacts.

Cloud-defend is a cloud-native, kubernetes product, so it only needs to be added container images, not the other installable package types.

This adds cloud-defend only to these image types: basic, ubi, wolfi, complete, and complete-wolfi.

Other image types are excluded; the new "elastic_agent_cloud_components" is now used for cloud and service images, and excludes cloud-defend. Slim and Edot images already do not include "elastic_agent_components", so they will not have cloud-defend.

Why is it important?

Cloud-defend is being added as a supported product in 9.3+, so it must be added to the elastic-agent container images.

Checklist

  • I have read and understood the pull request guidelines of this project.
  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in ./changelog/fragments using the changelog tool
  • I have added an integration test or an E2E test

Disruptive User Impact

N/A

@mjwolf
Add cloud-defend to agent packages.
5495670
@mjwolf
Add separate cloud/service package configurations
c821fdc 
In order to exclude cloud-defend from cloud and service images, the
package configuration for these image types needed to be separated from
the elastic_agent_components.

This adds the new configurations, which exclude cloud-defend, and
applies them to the these images.
@mjwolf
Use container-specific specs to include cloud-defend
ff3816b 
In order to exclude cloud-defend in non-container packages,
create container-specific specs which include it.
@mjwolf mjwolf requested a review from a team as a code owner November 26, 2025 20:45
@mergify mergify bot assigned mjwolf Nov 26, 2025
@mergify
Copy link
Contributor

mergify bot commented Nov 26, 2025

This pull request does not have a backport label. Could you fix it @mjwolf? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-./d./d is the label that automatically backports to the 8./d branch. /d is the digit
  • backport-active-all is the label that automatically backports to all active branches.
  • backport-active-8 is the label that automatically backports to all active minor branches for the 8 major.
  • backport-active-9 is the label that automatically backports to all active minor branches for the 9 major.

@pierrehilbert pierrehilbert added the Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team label Dec 1, 2025
@elasticmachine
Copy link
Contributor

elasticmachine commented Dec 1, 2025

Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane)

@mjwolf mjwolf requested a review from a team as a code owner December 1, 2025 20:43
v1v
v1v reviewed Dec 1, 2025
View reviewed changes
.buildkite/scripts/steps/integration-package.sh Outdated
export SNAPSHOT="true"
export EXTERNAL="true"
export USE_PACKAGE_VERSION="true"
export MAGEFILE_VERBOSE="true"
Copy link
Member

@v1v v1v Dec 1, 2025

Choose a reason for hiding this comment

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

Leftover?

@cmacknz
Copy link
Member

cmacknz commented Dec 1, 2025

If you want to reproduce what CI is doing locally try:

USE_PACKAGE_VERSION=true DOCKER_VARIANTS=basic EXTERNAL=true SNAPSHOT=true PACKAGES=docker PLATFORMS=linux/amd64 mage -v package

I get the same failure but I can't tell why

>>>>>>>>>>> Got packagename [cloud-defend-9.3.0-SNAPSHOT-linux-x86_64.tar.gz], looking for exact match
>>>>>>>>>>> Found exact match packageName for [main, 72eceeb9742bb683d135ab41fda2e5aeedbc3833]: {https://snapshots.elastic.co/9.3.0-eaf5f86d/downloads/cloud-defend/cloud-defend-9.3.0-SNAPSHOT-linux-x86_64.tar.gz https://snapshots.elastic.co/9.3.0-eaf5f86d/downloads/cloud-defend/cloud-defend-9.3.0-SNAPSHOT-linux-x86_64.tar.gz.sha512 https://snapshots.elastic.co/9.3.0-eaf5f86d/downloads/cloud-defend/cloud-defend-9.3.0-SNAPSHOT-linux-x86_64.tar.gz.asc tar x86_64 [linux]  {     }}
>>>>>>> Calculated directory to copy: [/Users/cmackenzie/go/src/github.com/elastic/elastic-agent/build/distributions/elastic-agent-drop/.elastic-agent_flat/linux-x86_64.tar.gz/cloud-defend-9.3.0-SNAPSHOT-linux-x86_64]
> prepare to copy /Users/cmackenzie/go/src/github.com/elastic/elastic-agent/build/distributions/elastic-agent-drop/.elastic-agent_flat/linux-x86_64.tar.gz/cloud-defend-9.3.0-SNAPSHOT-linux-x86_64 into /Users/cmackenzie/go/src/github.com/elastic/elastic-agent/build/distributions/elastic-agent-drop/linux-x86_64.tar.gz
package ran for 16.885143s
Error: lstat /Users/cmackenzie/go/src/github.com/elastic/elastic-agent/build/distributions/elastic-agent-drop/.elastic-agent_flat/linux-x86_64.tar.gz/cloud-defend-9.3.0-SNAPSHOT-linux-x86_64: no such file or directory

@pchila
Copy link
Member

pchila commented Dec 2, 2025

https://snapshots.elastic.co/9.3.0-eaf5f86d/downloads/cloud-defend/cloud-defend-9.3.0-SNAPSHOT-linux-x86_64.tar.gz.sha512

@cmacknz @mjwolf
I tried downloading the cloud-defend DRA from snapshots.elastic.co/9.3.0-eaf5f86d/downloads/cloud-defend/cloud-defend-9.3.0-SNAPSHOT-linux-x86_64.tar.gz and I see that the inner directory structure has some differences from the package declaration in packages.yml
image

  • There's a . directory at root (not sure how that translates when extracting, might disappear but it is still something that need to be fixed)
  • The root directory name is cloud-defend-9.3.0-SNAPSHOT-linux-x86_64/cloud-defend-9.3.0-SNAPSHOT-amd64 (the first element is suspicious) so the rootDir does not match the template cloud-defend-{{.Version}}-{{.Platform}}

@ebeahan ebeahan added the Team:Elastic-Agent Label for the Agent team label Dec 3, 2025
@elasticmachine
Copy link
Contributor

elasticmachine commented Dec 3, 2025 •
edited
Loading

💔 Build Failed

Failed CI Steps

History

cc @mjwolf

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@v1v v1v v1v left review comments

@blakerouse blakerouse Awaiting requested review from blakerouse blakerouse is a code owner automatically assigned from elastic/elastic-agent-control-plane

@michel-laterman michel-laterman Awaiting requested review from michel-laterman michel-laterman is a code owner automatically assigned from elastic/elastic-agent-control-plane

At least 1 approving review is required to merge this pull request.

Assignees

@mjwolf mjwolf

Labels

backport-skip Team:Elastic-Agent Label for the Agent team Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@mjwolf @elasticmachine @cmacknz @pchila @v1v @pierrehilbert @ebeahan