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.

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

[8.17](backport #6470) [8.x] restore cloud defend as an expected binary #6471

Merged
merged 1 commit into from
Jan 2, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 2, 2025

The cloud-defend binary was accidentally removed from 8.x starting with 8.17.0 in the backport for https://github.com/elastic/elastic-agent/pull/6042/files, likely as part of merge conflict resolution.

What does this PR do?

Includes the cloud-defend binary in the agent docker container again.

Why is it important?

Defend for containers which is implemented by cloud-defend is still a supported product in 8.x.

How to test this PR locally

DOCKER_VARIANTS=basic EXTERNAL=true SNAPSHOT=true PACKAGES=docker PLATFORMS=linux/arm64 mage package

docker run -it --entrypoint /bin/bash docker.elastic.co/beats/elastic-agent:8.18.0-SNAPSHOT
elastic-agent@240c9b878938:~$ ls data/elastic-agent-1f89c7/
components  elastic-agent  logs  otelcol  package.version
elastic-agent@240c9b878938:~$ ls data/elastic-agent-1f89c7/components/
LICENSE.txt                       bundle.tar.gz          lenses
NOTICE.pf-elastic-collector.txt   certs                  module
NOTICE.pf-elastic-symbolizer.txt  checksum.yml           osquery-extension.ext
NOTICE.pf-host-agent.txt          cloud-defend           osqueryd
NOTICE.txt                        cloud-defend.spec.yml  pf-elastic-collector

Related issues

* Restore cloud-defend as an expected binary.

* Add changelog.

(cherry picked from commit 79f5e13)
@mergify mergify bot requested a review from a team as a code owner January 2, 2025 18:50
@mergify mergify bot added the backport label Jan 2, 2025
@mergify mergify bot requested review from blakerouse and kaanyalti and removed request for a team January 2, 2025 18:50
@mergify mergify bot assigned cmacknz Jan 2, 2025
Copy link

Quality Gate passed Quality Gate passed

Issues
0 New issues
0 Fixed issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarQube

@cmacknz
Copy link
Member

cmacknz commented Jan 2, 2025

TestOtelAPMIngestion failure is unrelated, merging.

@cmacknz cmacknz merged commit 006a074 into 8.17 Jan 2, 2025
13 of 15 checks passed
@cmacknz cmacknz deleted the mergify/bp/8.17/pr-6470 branch January 2, 2025 21:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant