Skip to content

Add docker image name template and renamed fips cloud specs #8429

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 5 commits into from
Jun 10, 2025
Merged

Add docker image name template and renamed fips cloud specs #8429

merged 5 commits into from
Jun 10, 2025

Conversation

@pchila
Copy link
Member

@pchila pchila commented Jun 10, 2025 •
edited
Loading

What does this PR do?

This PR adds FIPS artifacts elastic-agent-cloud-fips* alongside the existing elastic-agent-fips-cloud* to ease scripting around fips/non-fips capable image variants.

Introduced a new optional packaging spec setting docker_image_name_template where a go template can be specified to control the rendered name of the docker image.

Why is it important?

Simplify scripting around fips/non-fips capable docjer image names.

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

How to test this PR locally

Related issues

Questions to ask yourself

  • How are we going to support this in production?
  • How are we going to measure its adoption?
  • How are we going to debug this?
  • What are the metrics I should take care of?
  • ...

@pchila pchila self-assigned this Jun 10, 2025
@pchila pchila added enhancement New feature or request Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team labels Jun 10, 2025
@mergify
Copy link
Contributor

mergify bot commented Jun 10, 2025

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

@elasticmachine
Copy link
Contributor

elasticmachine commented Jun 10, 2025 •
edited
Loading

💛 Build succeeded, but was flaky

Failed CI Steps

History

cc @pchila

@elastic-sonarqube
Copy link

elastic-sonarqube bot commented Jun 10, 2025

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

@pchila
Copy link
Member Author

pchila commented Jun 10, 2025

Packaging test run https://buildkite.com/elastic/elastic-agent-package/builds/6402

@pchila pchila added skip-changelog backport-8.19 Automated backport to the 8.19 branch labels Jun 10, 2025
@pchila
Copy link
Member Author

pchila commented Jun 10, 2025

Serverless test failure https://buildkite.com/elastic/elastic-agent/builds/22134#019759e7-a7f7-4525-9ea9-5de520a7a4bb/109-484 should be fixed by #8396

TestAPM failed because it looks like APM server wasn't accepting data
https://buildkite.com/elastic/elastic-agent/builds/22134#019759de-4b8a-40ae-95a0-3cc7ef7bfabe/274-1024
Automatic retry got it green (I assume that the second time APM server was ready to accept traffic)

@pchila pchila marked this pull request as ready for review June 10, 2025 14:16
@pchila pchila requested a review from a team as a code owner June 10, 2025 14:16
@pchila pchila requested review from michalpristas and swiatekm June 10, 2025 14:16
@elasticmachine
Copy link
Contributor

elasticmachine commented Jun 10, 2025

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

@pchila pchila requested a review from pkoutsovasilis June 10, 2025 14:17
pkoutsovasilis
pkoutsovasilis reviewed Jun 10, 2025
View reviewed changes
Copy link
Contributor

@pkoutsovasilis pkoutsovasilis left a comment

Choose a reason for hiding this comment

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

code changes LGTM, waiting for the CI to be green 🙂

pkoutsovasilis
pkoutsovasilis approved these changes Jun 10, 2025
View reviewed changes
Copy link
Contributor

@pkoutsovasilis pkoutsovasilis left a comment

Choose a reason for hiding this comment

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

ok I checked the artifacts and I can see that we produce a cloud-oriented one with -fips at the end. Could you please create a follow-up issue to remove the one with the -fips in the middle when the one with the proper name makes it in the unified release? 🙂 LGTM

@pchila pchila mentioned this pull request Jun 10, 2025
Closed
@pchila
Copy link
Member Author

pchila commented Jun 10, 2025 •
edited
Loading

ok I checked the artifacts and I can see that we produce a cloud-oriented one with -fips at the end. Could you please create a follow-up issue to remove the one with the -fips in the middle when the one with the proper name makes it in the unified release? 🙂 LGTM

Created #8442 to track the cleanup work for this

@pchila pchila merged commit 79dec1c into elastic:main Jun 10, 2025
12 of 13 checks passed
mergify bot pushed a commit that referenced this pull request Jun 10, 2025
@pchila @mergify
Add docker image name template and renamed fips cloud specs (#8429)
31d4094 
* Add docker image name template and renamed fips cloud specs

* Add debug log for saving docker images

(cherry picked from commit 79dec1c)

# Conflicts:
#	dev-tools/mage/dockerbuilder.go
#	dev-tools/mage/pkgtypes.go
@mergify mergify bot mentioned this pull request Jun 10, 2025
Merged
3 tasks
pchila added a commit that referenced this pull request Jun 10, 2025
@pchila
Add docker image name template and renamed fips cloud specs (#8429)
beba904 
* Add docker image name template and renamed fips cloud specs

* Add debug log for saving docker images
pchila added a commit that referenced this pull request Jun 10, 2025
@pchila
fixup! Add docker image name template and renamed fips cloud specs (#…
fa8541b 
…8429)
pchila added a commit that referenced this pull request Jun 10, 2025
@pchila
fixup! Add docker image name template and renamed fips cloud specs (#…
fd5864f 
…8429)
pchila added a commit that referenced this pull request Jun 10, 2025
@mergify @pchila
[8.19] (backport #8429) Add docker image name template and renamed fi…
23a0b70 
…ps cloud specs (#8443)

* Add docker image name template and renamed fips cloud specs (#8429)

* Add docker image name template and renamed fips cloud specs

* Add debug log for saving docker images

---------

Co-authored-by: Paolo Chilà <paolo.chila@elastic.co>
v1v added a commit that referenced this pull request Jun 12, 2025
@v1v
Merge branch 'feature/serverless-its-oblt-cli' into test/serverless-i…
e5259c9 
…ts-oblt-cli

* feature/serverless-its-oblt-cli: (51 commits)
  as agreed let's move the group to the kb.integration pipeline
  Update .github/workflows/serverless-project.yml
  ci: invoke serverless integration tests package from BK
  github-actions: create a serverless project daily
  [tests] split up serverless and resource leaks integration tests (#8396)
  chore: Update to elastic/beats@dfdc12e33de0 (#8446)
  Lock upgrade marker (#8254)
  build(deps): bump github.com/elastic/elastic-agent-system-metrics from 0.11.12 to 0.11.13 (#8420)
  Add docker image name template and renamed fips cloud specs (#8429)
  buildkite(scripts): refactor common scripts (#8365)
  Use require.Eventually to try and address flakiness (#8421)
  Fix pre-command to support extended testing (#8418)
  [Automation] Bump Golang version to 1.24.4 (#8384)
  chore: Update to elastic/beats@aed2a8b768bd (#8423)
  [main][Automation] Update versions (#8425)
  Add Pipeline to deploy custom agent image for FIPS testing (#8035)
  ci: automatically update OTel components (#8288)
  [Automation] Bump VM Image version to 1749258065 (#8390)
  fix: increase context timeout to accommodate for slower machines in Test_checkForUnprivilegedVault (#8374)
  otel: add cumulativetodeltaprocessor to EDOT collector (#8372)
  ...
@pchila pchila mentioned this pull request Jun 16, 2025
Merged
2 tasks
@mergify mergify bot mentioned this pull request Jun 16, 2025
Merged
2 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@michalpristas michalpristas Awaiting requested review from michalpristas michalpristas 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

1 more reviewer

@pkoutsovasilis pkoutsovasilis pkoutsovasilis approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@pchila pchila

Labels

backport-8.19 Automated backport to the 8.19 branch enhancement New feature or request 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.

3 participants

@pchila @elasticmachine @pkoutsovasilis