Skip to content

Fix multiarch service image push from main to serverless #10129

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
Merged
merged 9 commits into from
Sep 25, 2025
Merged

Fix multiarch service image push from main to serverless #10129

merged 9 commits into from
Sep 25, 2025

Conversation

blakerouse
Copy link
Contributor

What does this PR do?

Fixes the building and publishing of the service container to serverless from main.

Why is it important?

Without this change the image is only arm64 and not amd64.

@blakerouse blakerouse self-assigned this Sep 24, 2025
@blakerouse blakerouse added the Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team label Sep 24, 2025
@mergify Mergify
Copy link
Contributor

mergify bot commented Sep 24, 2025

This pull request does not have a backport label. Could you fix it @blakerouse? 🙏
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.

@mergify Mergify
Copy link
Contributor

mergify bot commented Sep 24, 2025

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b fix-main-to-serverless-multiarch-2 upstream/fix-main-to-serverless-multiarch-2
git merge upstream/main
git push upstream fix-main-to-serverless-multiarch-2

@blakerouse blakerouse changed the title Fix multiarch service image push from main to serverless (try 2) Fix multiarch service image push from main to serverless Sep 24, 2025
@blakerouse blakerouse marked this pull request as ready for review September 24, 2025 23:00
@blakerouse blakerouse requested review from a team as code owners September 24, 2025 23:00
@elasticmachine
Copy link
Collaborator

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

@blakerouse blakerouse mentioned this pull request Sep 25, 2025
Closed
v1v
v1v reviewed Sep 25, 2025
View reviewed changes
nkvoll
nkvoll previously approved these changes Sep 25, 2025
View reviewed changes
Copy link
Member

@nkvoll nkvoll left a comment

Choose a reason for hiding this comment

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

Separate from @v1v's comments, the resulting image from https://buildkite.com/elastic/agentless-serverless-release/builds/127/steps/canvas?sid=01997d89-cb01-4e1b-989b-b085a8458de9 / ecp-internal-release.sh seems correct for me, expected size, containing both architectures, starts up elastic-agent successfully for me on both architectures. 👍

@blakerouse blakerouse requested a review from a team as a code owner September 25, 2025 14:51
@blakerouse
Copy link
Contributor Author

@v1v I have updated the areas requested.

@nkvoll If you could give it another review as the change has dismissed your previous review.

v1v
v1v reviewed Sep 25, 2025
View reviewed changes
@elastic-sonarqube Elastic SonarQube
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

@elasticmachine
Copy link
Collaborator

💚 Build Succeeded

History

cc @blakerouse

@blakerouse blakerouse merged commit 0f7f287 into main Sep 25, 2025
23 checks passed
@blakerouse blakerouse deleted the fix-main-to-serverless-multiarch-2 branch September 25, 2025 18:37
v1v added a commit that referenced this pull request Sep 26, 2025
@v1v
Merge remote-tracking branch 'upstream' into test/gh-runners-macos
517a15e 
* upstream: (505 commits)
  Update journald tests now that Filebeat supports watching folders (#10131)
  [deploy/kubernetes]: add info about hostPID for Universal Profiling (#10173)
  Fall back to process runtime if otel runtime is unsupported (#10087)
  Conditionall check for ms_tls13kdf build tag (#10160)
  [docs][edot] add entry for profiles (#10163)
  edot/docs: add support for profiles (#10146)
  Add Logstash exporter (#10137)
  Add back publish to serverless. (#10159)
  Improve Integration test documentation (#10155)
  Fix multiarch service image push from main to serverless (#10129)
  Forward migrate action to endpoint (#9801)
  Comment out check for ms_tls13kdf tag for FIPS-capable binaries (#10148)
  [otel] add receivers: apache, iis, mysql, postgresql, sqlserver v0.135.0 (#9344)
  Add k8sevents receiver in kube-stack (#10086)
  feat: emit system resource metrics for EDOT subprocess (#10003)
  [AutoOps] Configure OTel Exporter to Send Maximum-sized Batches (#10126)
  keep enrollment token when replacing data with signed (#10115)
  Revert "Publish `elastic-agent-service` container directly to serverless from main (#9583)" (#10127)
  Add agent_policy_id and policy_revision_idx to checkin requests (#9931)
  remove resource/k8s processor and use k8sattributes processor for service attributes (#10108)
  ...
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

@nkvoll nkvoll nkvoll approved these changes

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

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

Assignees

@blakerouse blakerouse

Labels
skip-changelog 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.
4 participants
@blakerouse @elasticmachine @nkvoll @v1v